dragon boss bug fixed

0xMartin · Feb 4, 2024 · e387d12 · e387d12
1 parent ea44960
commit e387d12
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 166 deletions.
diff --git a/DoggyMan3D/Assets/AssetPackages/CircleTransition/CircleTransitionMaterial.mat b/DoggyMan3D/Assets/AssetPackages/CircleTransition/CircleTransitionMaterial.mat
@@ -74,7 +74,7 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
-    - _Radius: 1
+    - _Radius: 0
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1

diff --git a/DoggyMan3D/Assets/Prefabs/Entity/DragonBoss.prefab b/DoggyMan3D/Assets/Prefabs/Entity/DragonBoss.prefab
@@ -3262,7 +3262,7 @@ MonoBehaviour:
   IsEnabledMoving: 1
   IsHitEnabled: 1
   Name: Dragon
-  Lives: 1700
+  Lives: 1900
   MaxStamina: 100000
   AttacksDamages: 16000000
   StaminaDownSpeed: 6.5

diff --git a/DoggyMan3D/Assets/Prefabs/FX/DragonFlame.prefab b/DoggyMan3D/Assets/Prefabs/FX/DragonFlame.prefab
@@ -4848,7 +4848,7 @@ MonoBehaviour:
   StartLightIntensity: 8
   ActiveTime: 2
   FadeOutTime: 1.2
-  MaxColliderLength: 8
+  MaxColliderLength: 10
 --- !u!65 &4201034003776028506
 BoxCollider:
   m_ObjectHideFlags: 0

diff --git a/DoggyMan3D/Assets/Scenes/Game/Level5.unity b/DoggyMan3D/Assets/Scenes/Game/Level5.unity
@@ -45905,7 +45905,6 @@ Transform:
   - {fileID: 643907946}
   - {fileID: 1616720649}
   - {fileID: 1070426461}
-  - {fileID: 1959107639}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &491053545
@@ -56987,6 +56986,74 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 1750199053}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &700721705
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 609598371748289545, guid: 8f5b0c0e5efd94140a9c04a98d0cd443,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 33.991535
+      objectReference: {fileID: 0}
+    - target: {fileID: 609598371748289545, guid: 8f5b0c0e5efd94140a9c04a98d0cd443,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 80.78059
+      objectReference: {fileID: 0}
+    - target: {fileID: 609598371748289545, guid: 8f5b0c0e5efd94140a9c04a98d0cd443,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 105.328316
+      objectReference: {fileID: 0}
+    - target: {fileID: 609598371748289545, guid: 8f5b0c0e5efd94140a9c04a98d0cd443,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 609598371748289545, guid: 8f5b0c0e5efd94140a9c04a98d0cd443,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 609598371748289545, guid: 8f5b0c0e5efd94140a9c04a98d0cd443,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 609598371748289545, guid: 8f5b0c0e5efd94140a9c04a98d0cd443,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 609598371748289545, guid: 8f5b0c0e5efd94140a9c04a98d0cd443,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 609598371748289545, guid: 8f5b0c0e5efd94140a9c04a98d0cd443,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 609598371748289545, guid: 8f5b0c0e5efd94140a9c04a98d0cd443,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 610239954286402135, guid: 8f5b0c0e5efd94140a9c04a98d0cd443,
+        type: 3}
+      propertyPath: m_Name
+      value: Bottle_Stamina
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 8f5b0c0e5efd94140a9c04a98d0cd443, type: 3}
 --- !u!1 &710769670
 GameObject:
   m_ObjectHideFlags: 0
@@ -124496,74 +124563,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 1598393999}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &1599833130
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 486105027}
-    m_Modifications:
-    - target: {fileID: 2105009599278279176, guid: 8459e202f2f568441a925fc7e213d0ac,
-        type: 3}
-      propertyPath: m_Name
-      value: Bottle_Health (3)
-      objectReference: {fileID: 0}
-    - target: {fileID: 2106496531831910848, guid: 8459e202f2f568441a925fc7e213d0ac,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 34.197727
-      objectReference: {fileID: 0}
-    - target: {fileID: 2106496531831910848, guid: 8459e202f2f568441a925fc7e213d0ac,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 80.82113
-      objectReference: {fileID: 0}
-    - target: {fileID: 2106496531831910848, guid: 8459e202f2f568441a925fc7e213d0ac,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 104.94185
-      objectReference: {fileID: 0}
-    - target: {fileID: 2106496531831910848, guid: 8459e202f2f568441a925fc7e213d0ac,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2106496531831910848, guid: 8459e202f2f568441a925fc7e213d0ac,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2106496531831910848, guid: 8459e202f2f568441a925fc7e213d0ac,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2106496531831910848, guid: 8459e202f2f568441a925fc7e213d0ac,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2106496531831910848, guid: 8459e202f2f568441a925fc7e213d0ac,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2106496531831910848, guid: 8459e202f2f568441a925fc7e213d0ac,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2106496531831910848, guid: 8459e202f2f568441a925fc7e213d0ac,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 8459e202f2f568441a925fc7e213d0ac, type: 3}
 --- !u!4 &1616720649 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 609598371748289545, guid: 8f5b0c0e5efd94140a9c04a98d0cd443,
@@ -145457,12 +145456,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 1956949019}
   m_PrefabAsset: {fileID: 0}
---- !u!4 &1959107639 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 2106496531831910848, guid: 8459e202f2f568441a925fc7e213d0ac,
-    type: 3}
-  m_PrefabInstance: {fileID: 1599833130}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &1968229648 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 5341475264633809669, guid: 74a70b9e56820a0418f0641ea3210619,
@@ -165549,3 +165542,4 @@ SceneRoots:
   - {fileID: 321408108}
   - {fileID: 486105027}
   - {fileID: 481833171}
+  - {fileID: 700721705}
diff --git a/...Man3D/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset b/...Man3D/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
diff --git a/DoggyMan3D/ProjectSettings/ProjectSettings.asset b/DoggyMan3D/ProjectSettings/ProjectSettings.asset
@@ -142,7 +142,8 @@ PlayerSettings:
   vulkanEnableCommandBufferRecycling: 1
   loadStoreDebugModeEnabled: 0
   bundleVersion: 0.2
-  preloadedAssets: []
+  preloadedAssets:
+  - {fileID: 11400000, guid: 9e7be553448fa2546aea5752021cbcf7, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1