Merge branch 'develop' of http://175.209.66.186/capersunity/newbluewater into ntg

2024-06-28 12:22:57 +09:00 · 2024-06-28 12:22:57 +09:00 · b0f8a7a896
commit b0f8a7a896
parent 4313ee71ba 1384181f52
29 changed files with 2888 additions and 814 deletions
--- a/Assets/01.Scenes/99.Combat3.unity
+++ b/Assets/01.Scenes/99.Combat3.unity
@ -980,7 +980,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  version: 1073741824
  data:
-    dataString: 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
+    dataString: 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
    file_cachedStartup: {fileID: 4900000, guid: 6667cce87a89cd645becd4a92e85c888, type: 3}
    cacheStartup: 0
  showNavGraphs: 1
@ -1310,7 +1310,7 @@ Transform:
  m_GameObject: {fileID: 191889754}
  serializedVersion: 2
  m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927}
-  m_LocalPosition: {x: 195.01, y: 19.283628, z: 171.19867}
+  m_LocalPosition: {x: 0, y: 19.283628, z: -27.981337}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
@ -1756,7 +1756,7 @@ Transform:
  m_GameObject: {fileID: 285952512}
  serializedVersion: 2
  m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927}
-  m_LocalPosition: {x: 195.01, y: 19.283628, z: 171.19867}
+  m_LocalPosition: {x: 0, y: 19.283628, z: -27.981337}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
@ -6873,17 +6873,9 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 0}
    m_Modifications:
-    - target: {fileID: 668700138157159316, guid: 680ce017bd2b7d34a99245242d032120, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 195.01
-      objectReference: {fileID: 0}
-    - target: {fileID: 668700138157159316, guid: 680ce017bd2b7d34a99245242d032120, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
    - target: {fileID: 668700138157159316, guid: 680ce017bd2b7d34a99245242d032120, type: 3}
      propertyPath: m_LocalPosition.z
-      value: 194.18
+      value: -5
      objectReference: {fileID: 0}
    - target: {fileID: 668700138157159316, guid: 680ce017bd2b7d34a99245242d032120, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
@ -6950,10 +6942,6 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 0}
    m_Modifications:
-    - target: {fileID: 3043442715162385106, guid: 39e32b91cc570794e9e843b39f89e400, type: 3}
-      propertyPath: m_Enabled
-      value: 1
-      objectReference: {fileID: 0}
    - target: {fileID: 5230841042572963376, guid: 39e32b91cc570794e9e843b39f89e400, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
      value: 0
@ -11018,7 +11006,7 @@ MonoBehaviour:
  <TitanSlimeMapController>k__BackingField: {fileID: 36953787}
  <RhinocerosMapController>k__BackingField: {fileID: 1011270532}
  <SandMoleMapController>k__BackingField: {fileID: 1213070730}
-  _dailyBgm: DailyBgm1
+  <DailyBgm>k__BackingField: DailyBgm2
 --- !u!4 &1597727070
 Transform:
  m_ObjectHideFlags: 0
@ -11506,73 +11494,6 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1704481408}
  m_CullTransparentMesh: 0
--- !u!1 &1715186577
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1715186579}
-  - component: {fileID: 1715186578}
-  - component: {fileID: 1715186580}
-  m_Layer: 3
-  m_Name: PostProcessingVolume
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!114 &1715186578
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1715186577}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IsGlobal: 1
-  priority: 0
-  blendDistance: 0
-  weight: 1
-  sharedProfile: {fileID: 11400000, guid: da9f66a87cd612d4e847d191aa6df602, type: 2}
--- !u!4 &1715186579
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1715186577}
-  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_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1715186580
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1715186577}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d287dbc75fdbb6b44bd97e6d0604b227, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _persistent: 1
-  _isLerpIntensity: 1
-  _startIntensity: 0.15
-  _endIntensity: 0.2
-  _lerpTime: 1
 --- !u!1 &1719893243
 GameObject:
  m_ObjectHideFlags: 0
@ -14626,6 +14547,63 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
+--- !u!1001 &657457093462647415
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 1492562680585263202, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1492562680585263202, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1492562680585263202, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1492562680585263202, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1492562680585263202, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1492562680585263202, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1492562680585263202, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1492562680585263202, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1492562680585263202, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1492562680585263202, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6468678730395126332, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3}
+      propertyPath: m_Name
+      value: PostProcessingVolume
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3}
 --- !u!1 &657515045302343592
 GameObject:
  m_ObjectHideFlags: 0
@ -23067,7 +23045,7 @@ SceneRoots:
  - {fileID: 1184277681}
  - {fileID: 191889762}
  - {fileID: 2043119555}
-  - {fileID: 1715186579}
+  - {fileID: 657457093462647415}
  - {fileID: 1816611989}
  - {fileID: 882036795}
  - {fileID: 269653247}
--- a/Assets/AnimateUIMaterials-main/Releases/Animate
+++ b/Assets/AnimateUIMaterials-main/Releases/Animate
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a421a1d40bb6873448fb56216aceb0db
+guid: 2d09f9ff338a70c448621adbcc1a6fd7
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/Assets/01.Scenes/99.Combat3.unity.meta
+++ b/Assets/01.Scenes/99.Combat3.unity.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: c935cfefe5ba322459a7ab9f61143e7c
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/04.Materials/Maps/GroundFog.mat
+++ b/Assets/04.Materials/Maps/GroundFog.mat
@ -127,8 +127,8 @@ Material:
    - _Smoothness: 0.5
    - _SmoothnessTextureChannel: 0
    - _SoftParticlesEnabled: 1
-    - _SoftParticlesFarFadeDistance: 5
-    - _SoftParticlesNearFadeDistance: 0
+    - _SoftParticlesFarFadeDistance: 3.19
+    - _SoftParticlesNearFadeDistance: 1
    - _SpecularHighlights: 1
    - _SrcBlend: 5
    - _SrcBlendAlpha: 1
@ -141,7 +141,7 @@ Material:
    - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
    - _Color: {r: 0, g: 0, b: 0, a: 0.9019608}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _SoftParticleFadeParams: {r: 0, g: 0.2, b: 0, a: 0}
+    - _SoftParticleFadeParams: {r: 1, g: 0.456621, b: 0, a: 0}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
  m_AllowLocking: 1
--- a/Assets/04.Materials/TransparentLit.mat
+++ b/Assets/04.Materials/TransparentLit.mat
@ -39,6 +39,7 @@ Material:
  disabledShaderPasses:
  - MOTIONVECTORS
  - DepthOnly
+  - SHADOWCASTER
  m_LockedProperties: 
  m_SavedProperties:
    serializedVersion: 3
--- a/Assets/05.Prefabs/Maps/MapControllers/RhinocerosMapController.prefab
+++ b/Assets/05.Prefabs/Maps/MapControllers/RhinocerosMapController.prefab
--- a/Assets/05.Prefabs/Props/Environment/FallBush01.prefab
+++ b/Assets/05.Prefabs/Props/Environment/FallBush01.prefab
@ -88,6 +88,18 @@ PrefabInstance:
      propertyPath: m_Name
      value: FallBush01
      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/FallTree01.prefab
+++ b/Assets/05.Prefabs/Props/Environment/FallTree01.prefab
@ -92,6 +92,26 @@ PrefabInstance:
      propertyPath: m_Name
      value: FallTree01
      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_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6979769420770763780, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      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
      value: 
--- a/Assets/06.Sounds/Bgm/Frieren
+++ b/Assets/06.Sounds/Bgm/Frieren
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 436cec88a3723e74baf4088b9508c79c
+guid: 757b9f9d3afb0b240a064767538b9e47
 AudioImporter:
  externalObjects: {}
  serializedVersion: 8
--- a/Assets/06.Sounds/Sfx/Characters/Enemies/Bosses/SandMole/SandMoleDigInSfx.mp3
+++ b/Assets/06.Sounds/Sfx/Characters/Enemies/Bosses/SandMole/SandMoleDigInSfx.mp3
--- a/Assets/06.Sounds/Sfx/Characters/Enemies/Bosses/SandMole/ThrowSpikeSfx.mp3
+++ b/Assets/06.Sounds/Sfx/Characters/Enemies/Bosses/SandMole/ThrowSpikeSfx.mp3
--- a/Assets/06.Sounds/Sfx/Characters/Enemies/Bosses/SandMole/ThrowSpikesSfx.mp3
+++ b/Assets/06.Sounds/Sfx/Characters/Enemies/Bosses/SandMole/ThrowSpikesSfx.mp3
--- 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: