전투맵 수정 2차

-마법진 사이즈 및 위치 수정 -슬라임 맵 프롭 위치 수정
2024-06-24 17:44:10 +09:00 · 2024-06-24 17:44:10 +09:00 · 76134bc0c7
commit 76134bc0c7
parent 7d408dba4d
29 changed files with 7130 additions and 2548 deletions
--- a/Assets/01.Scenes/99.Combat2.unity.meta
+++ b/Assets/01.Scenes/99.Combat2.unity.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 46c51422ce076d34f9ffbafa51b6f336
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/01.Scenes/99.Combat3.unity
+++ b/Assets/01.Scenes/99.Combat3.unity
--- a/Assets/AnimateUIMaterials-main/Releases/Animate
+++ b/Assets/AnimateUIMaterials-main/Releases/Animate
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a421a1d40bb6873448fb56216aceb0db
+guid: c935cfefe5ba322459a7ab9f61143e7c
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/Assets/04.Materials/TransparentLit.mat
+++ b/Assets/04.Materials/TransparentLit.mat
@ -38,6 +38,7 @@ Material:
  disabledShaderPasses:
  - MOTIONVECTORS
  - DepthOnly
+  - SHADOWCASTER
  m_LockedProperties: 
  m_SavedProperties:
    serializedVersion: 3
--- a/Assets/05.Prefabs/Maps/BossMapTrigger.prefab
+++ b/Assets/05.Prefabs/Maps/BossMapTrigger.prefab
@ -28,9 +28,9 @@ Transform:
  m_GameObject: {fileID: 873287429936955811}
  serializedVersion: 2
  m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: 0.001, z: -0.5}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_LocalPosition: {x: 0, y: 0.037, z: -0.7047182}
+  m_LocalScale: {x: 3.5, y: 3.5, z: 3.5}
+  m_ConstrainProportionsScale: 1
  m_Children: []
  m_Father: {fileID: 7348979974277454575}
  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- a/Assets/05.Prefabs/Maps/MapControllers/SandMoleMapController.prefab
+++ b/Assets/05.Prefabs/Maps/MapControllers/SandMoleMapController.prefab
@ -1482,6 +1482,26 @@ PrefabInstance:
      propertyPath: m_IsActive
      value: 1
      objectReference: {fileID: 0}
+    - target: {fileID: 5684081474487815918, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5684081474487815918, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5684081474487815918, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5684081474487815918, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -0.87
+      objectReference: {fileID: 0}
+    - target: {fileID: 5684081474487815918, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 5711256728325704458, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
      propertyPath: m_LocalScale.y
      value: 25
@ -1734,13 +1754,25 @@ PrefabInstance:
      propertyPath: m_Name
      value: IceTree01
      objectReference: {fileID: 0}
+    - target: {fileID: 2332225084991166375, guid: 3770065ecdd9c6348989031b36c5324d, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 8.87172
+      objectReference: {fileID: 0}
+    - target: {fileID: 2332225084991166375, guid: 3770065ecdd9c6348989031b36c5324d, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 8.87172
+      objectReference: {fileID: 0}
+    - target: {fileID: 2332225084991166375, guid: 3770065ecdd9c6348989031b36c5324d, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 8.87172
+      objectReference: {fileID: 0}
    - target: {fileID: 2332225084991166375, guid: 3770065ecdd9c6348989031b36c5324d, type: 3}
      propertyPath: m_LocalPosition.x
-      value: 15.5099945
+      value: 14.8
      objectReference: {fileID: 0}
    - target: {fileID: 2332225084991166375, guid: 3770065ecdd9c6348989031b36c5324d, type: 3}
      propertyPath: m_LocalPosition.y
-      value: -1.61
+      value: -3.87
      objectReference: {fileID: 0}
    - target: {fileID: 2332225084991166375, guid: 3770065ecdd9c6348989031b36c5324d, type: 3}
      propertyPath: m_LocalPosition.z
--- a/Assets/05.Prefabs/Maps/MapControllers/TitanSlimeMapController.prefab
+++ b/Assets/05.Prefabs/Maps/MapControllers/TitanSlimeMapController.prefab
--- a/Assets/05.Prefabs/Props/Environment/Bush01.prefab
+++ b/Assets/05.Prefabs/Props/Environment/Bush01.prefab
@ -52,6 +52,18 @@ PrefabInstance:
      propertyPath: m_Name
      value: Bush01
      objectReference: {fileID: 0}
+    - target: {fileID: 6979769420770763780, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.9848078
+      objectReference: {fileID: 0}
+    - target: {fileID: 6979769420770763780, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.17364816
+      objectReference: {fileID: 0}
+    - target: {fileID: 6979769420770763780, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 20
+      objectReference: {fileID: 0}
    - target: {fileID: 7250046307267553722, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
      propertyPath: m_Sprite
      value: 
--- a/Assets/05.Prefabs/Props/Environment/Bush02.prefab
+++ b/Assets/05.Prefabs/Props/Environment/Bush02.prefab
@ -76,6 +76,18 @@ PrefabInstance:
      propertyPath: m_Name
      value: Bush02
      objectReference: {fileID: 0}
+    - target: {fileID: 6979769420770763780, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.9848078
+      objectReference: {fileID: 0}
+    - target: {fileID: 6979769420770763780, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.17364816
+      objectReference: {fileID: 0}
+    - target: {fileID: 6979769420770763780, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 20
+      objectReference: {fileID: 0}
    - target: {fileID: 7250046307267553722, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
      propertyPath: m_Sprite
      value: 
--- a/Assets/05.Prefabs/Props/Environment/IceTree01.prefab
+++ b/Assets/05.Prefabs/Props/Environment/IceTree01.prefab
@ -60,6 +60,18 @@ PrefabInstance:
      propertyPath: m_Name
      value: IceTree01
      objectReference: {fileID: 0}
+    - target: {fileID: 7050571487355227770, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.9961947
+      objectReference: {fileID: 0}
+    - target: {fileID: 7050571487355227770, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.08715578
+      objectReference: {fileID: 0}
+    - target: {fileID: 7050571487355227770, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 10
+      objectReference: {fileID: 0}
    - target: {fileID: 7320848118163047364, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3}
      propertyPath: m_Sprite
      value: 
--- a/Assets/05.Prefabs/Props/Environment/Tree01.prefab
+++ b/Assets/05.Prefabs/Props/Environment/Tree01.prefab
@ -82,7 +82,19 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 3210918493867778633, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
      propertyPath: m_Name
-      value: DeathTree01
+      value: Tree01
+      objectReference: {fileID: 0}
+    - target: {fileID: 6979769420770763780, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.9961947
+      objectReference: {fileID: 0}
+    - target: {fileID: 6979769420770763780, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.08715578
+      objectReference: {fileID: 0}
+    - target: {fileID: 6979769420770763780, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 10
      objectReference: {fileID: 0}
    - target: {fileID: 7250046307267553722, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
      propertyPath: m_Sprite
--- a/Assets/05.Prefabs/Props/Environment/Tree02.prefab
+++ b/Assets/05.Prefabs/Props/Environment/Tree02.prefab
@ -82,7 +82,19 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 3210918493867778633, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
      propertyPath: m_Name
-      value: DeathTree02
+      value: Tree02
+      objectReference: {fileID: 0}
+    - target: {fileID: 6979769420770763780, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.9961947
+      objectReference: {fileID: 0}
+    - target: {fileID: 6979769420770763780, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.08715578
+      objectReference: {fileID: 0}
+    - target: {fileID: 6979769420770763780, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 10
      objectReference: {fileID: 0}
    - target: {fileID: 7250046307267553722, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
      propertyPath: m_Sprite
--- a/Assets/AnimateUIMaterials-main/Releases/Animate
+++ b/Assets/AnimateUIMaterials-main/Releases/Animate
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 59c5c73275d5dc24e86b15fa0c096fc6
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/AnimateUIMaterials-main/Releases/Animate
+++ b/Assets/AnimateUIMaterials-main/Releases/Animate
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: aedd64c71808f2744a5d7548cc71ab31
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/AnimateUIMaterials-main/Releases/Animate
+++ b/Assets/AnimateUIMaterials-main/Releases/Animate
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: d0ea7b4db6a72ab478fb5882f6701d4e
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/AnimateUIMaterials-main/Releases/Animate
+++ b/Assets/AnimateUIMaterials-main/Releases/Animate
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 8687348a7454d414395b305a8d3ee5b9
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/AnimateUIMaterials-main/Releases/Animate
+++ b/Assets/AnimateUIMaterials-main/Releases/Animate
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: aabe8f32671273c4bbd2b89451c457eb
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/AnimateUIMaterials-main/Releases/Animate
+++ b/Assets/AnimateUIMaterials-main/Releases/Animate
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 1b049f0ecf916d24db335df912c531d7
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/AnimateUIMaterials-main/Releases/Animate
+++ b/Assets/AnimateUIMaterials-main/Releases/Animate
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 5de603c9aab95b04d8ebb1b492b94898
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/(2020.3.45f1).unitypackage.meta
+++ b/(2020.3.45f1).unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 3d7c4217783978e4abe6496ac71eee94
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Pack/PNG/Style2_CasualGame(320)/Before(v1.0)/Before_(v1.0).unitypackage.meta
+++ b/Pack/PNG/Style2_CasualGame(320)/Before(v1.0)/Before_(v1.0).unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 687baaea481bf4234b879dce13527276
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Plugins/Borodar/RainbowHierarchy/Source/RainbowHierarchy.src.unitypackage.meta
+++ b/Assets/Plugins/Borodar/RainbowHierarchy/Source/RainbowHierarchy.src.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 617b3f1032a08c14ebfedfa340767cdf
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Plugins/Sirenix/Demos/Custom
+++ b/Assets/Plugins/Sirenix/Demos/Custom
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: f597f19f656ba56eae4f6a3a7cc528f4
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Plugins/Sirenix/Demos/Custom
+++ b/Assets/Plugins/Sirenix/Demos/Custom
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 48e08dc33330d11e9d4a1b246c52e4f6
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Plugins/Sirenix/Demos/Editor
+++ b/Assets/Plugins/Sirenix/Demos/Editor
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: ed09910c0094cb27be8f3ca264680da3
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Plugins/Sirenix/Demos/Sample
+++ b/Assets/Plugins/Sirenix/Demos/Sample
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: cc355dd4cf1e6173beaeb22c2858cbe1
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Packages/com.distantlands.cozy.core/Content/Integration/Import
+++ b/Packages/com.distantlands.cozy.core/Content/Integration/Import
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 2f1b9c7f4731e2d44af6b3606190070b
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Packages/com.distantlands.cozy.core/Content/Integration/Import
+++ b/Packages/com.distantlands.cozy.core/Content/Integration/Import
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: c226d4e6697573345932a7bf39dd615a
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Packages/com.distantlands.cozy.core/Content/Integration/Import
+++ b/Packages/com.distantlands.cozy.core/Content/Integration/Import
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 3643c0d76ec153646b1203880bfb64ed
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: