diff --git a/Assets/Materials/Shop/Pet Image/Bomb.png b/Assets/Materials/Shop/Pet Image/Bomb.png
index 8f22521b65ad311788af5a9df6420e7b4d18f4ea..1c86261bafd3d73b5bb1e9c3bf84740c040e0043 100644
Binary files a/Assets/Materials/Shop/Pet Image/Bomb.png and b/Assets/Materials/Shop/Pet Image/Bomb.png differ
diff --git a/Assets/Materials/Shop/Pet Image/Cactus.png b/Assets/Materials/Shop/Pet Image/Cactus.png
index 9e8586b6eef3a11b156e7c1a8796a67ddd697af7..ffb9d12677b271b1f2a6d85d36310860a3cf924e 100644
Binary files a/Assets/Materials/Shop/Pet Image/Cactus.png and b/Assets/Materials/Shop/Pet Image/Cactus.png differ
diff --git a/Assets/Materials/Shop/Pet Image/Dog.png b/Assets/Materials/Shop/Pet Image/Dog.png
new file mode 100644
index 0000000000000000000000000000000000000000..94b67eaed5b8201631fe66ad72b25b1fd0231e46
Binary files /dev/null and b/Assets/Materials/Shop/Pet Image/Dog.png differ
diff --git a/Assets/Materials/Shop/Pet Image/Dog.png.meta b/Assets/Materials/Shop/Pet Image/Dog.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..ac847a2e58da9a50c147fa3841ccfad3867bbd0b
--- /dev/null
+++ b/Assets/Materials/Shop/Pet Image/Dog.png.meta
@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 2e24f9d48b4681a47a9be5931766ba3a
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 12
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ flipGreenChannel: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMipmapLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 1
+ aniso: 1
+ mipBias: 0
+ wrapU: 0
+ wrapV: 0
+ wrapW: 0
+ nPOTScale: 1
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 0
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 0
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ swizzle: 50462976
+ cookieLightType: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID:
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ nameFileIdTable: {}
+ mipmapLimitGroupName:
+ pSDRemoveMatte: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Materials/Shop/Pet Image/DogKnight.png b/Assets/Materials/Shop/Pet Image/DogKnight.png
index aee79240468542311c27cd264a150bbbdef79800..94b67eaed5b8201631fe66ad72b25b1fd0231e46 100644
Binary files a/Assets/Materials/Shop/Pet Image/DogKnight.png and b/Assets/Materials/Shop/Pet Image/DogKnight.png differ
diff --git a/Assets/Materials/Shop/Pet Image/Ghost.png b/Assets/Materials/Shop/Pet Image/Ghost.png
index f83dc1b3c43ebe47d9c3c3c52b02d99683bf4336..15bbdcd580aa3dcfbd158e8ffc55fe3e17920946 100644
Binary files a/Assets/Materials/Shop/Pet Image/Ghost.png and b/Assets/Materials/Shop/Pet Image/Ghost.png differ
diff --git a/Assets/Materials/Shop/Pet Image/Mushroom.png b/Assets/Materials/Shop/Pet Image/Mushroom.png
index ded22156e2282749230a1a5e6cb565f57bbc3c2f..be6ccfca4373da71833c56d6b2ab778be2f065cf 100644
Binary files a/Assets/Materials/Shop/Pet Image/Mushroom.png and b/Assets/Materials/Shop/Pet Image/Mushroom.png differ
diff --git a/Assets/Materials/Shop/Pet Image/Rabbit.png b/Assets/Materials/Shop/Pet Image/Rabbit.png
index a7958857c43c032dc77262f1dabce5034f9d1ae3..7d017a2a3167184ca29240d98c46a49905de3015 100644
Binary files a/Assets/Materials/Shop/Pet Image/Rabbit.png and b/Assets/Materials/Shop/Pet Image/Rabbit.png differ
diff --git a/Assets/_CompletedAssets/Prefabs/Pet/Attacker/CactusPBR.prefab b/Assets/_CompletedAssets/Prefabs/Pet/Attacker/CactusPBR.prefab
index 2d54430aa69613dc5b44a29df8291d2cc4045098..f1109a0db104de56ac9c12e3465e60486f8e3db5 100644
--- a/Assets/_CompletedAssets/Prefabs/Pet/Attacker/CactusPBR.prefab
+++ b/Assets/_CompletedAssets/Prefabs/Pet/Attacker/CactusPBR.prefab
@@ -108,7 +108,6 @@ GameObject:
- component: {fileID: 178560101459360467}
- component: {fileID: 6096312193273766057}
- component: {fileID: -6541114117943995370}
- - component: {fileID: -184371437475910449}
- component: {fileID: 2930937254909909696}
- component: {fileID: -8520458214133471887}
- component: {fileID: -902424973161483714}
@@ -186,32 +185,6 @@ Rigidbody:
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
---- !u!143 &-184371437475910449
-CharacterController:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 662468794185850985}
- m_Material: {fileID: 0}
- m_IncludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_ExcludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_LayerOverridePriority: 0
- m_IsTrigger: 0
- m_ProvidesContacts: 0
- m_Enabled: 1
- serializedVersion: 3
- m_Height: 1
- m_Radius: 0.3
- m_SlopeLimit: 45
- m_StepOffset: 0.3
- m_SkinWidth: 0.08
- m_MinMoveDistance: 0.001
- m_Center: {x: 0, y: 0, z: 0}
--- !u!195 &2930937254909909696
NavMeshAgent:
m_ObjectHideFlags: 0
@@ -263,7 +236,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
enemyTag: Enemy
- speed: 6
+ speed: 3
--- !u!114 &6883497329515407097
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -279,8 +252,6 @@ MonoBehaviour:
startingHealth: 50
currentHealth: 0
sinkSpeed: 2.5
- deathClip: {fileID: 8300000, guid: fd27dad5b50788d49834b1ba9c84b66a, type: 3}
- audioSource: {fileID: 0}
--- !u!114 &684789188047177027
MonoBehaviour:
m_ObjectHideFlags: 0
diff --git a/Assets/_CompletedAssets/Prefabs/Pet/Attacker/DogPBR.prefab b/Assets/_CompletedAssets/Prefabs/Pet/Attacker/DogPBR.prefab
index e6808b7ee855d53420c2e4a541f3f504dca0d0f8..b8c7d435a3254430f4f015d7cd9546de4f32d04a 100644
--- a/Assets/_CompletedAssets/Prefabs/Pet/Attacker/DogPBR.prefab
+++ b/Assets/_CompletedAssets/Prefabs/Pet/Attacker/DogPBR.prefab
@@ -1263,7 +1263,6 @@ GameObject:
- component: {fileID: 8422892626600249584}
- component: {fileID: 8422892626592999198}
- component: {fileID: -6756402677965361156}
- - component: {fileID: -6095491673820764166}
- component: {fileID: -5945668371830106230}
- component: {fileID: 1718273255221135608}
- component: {fileID: 4723511964521571630}
@@ -1341,32 +1340,6 @@ Rigidbody:
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
---- !u!143 &-6095491673820764166
-CharacterController:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8422892626600285392}
- m_Material: {fileID: 0}
- m_IncludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_ExcludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_LayerOverridePriority: 0
- m_IsTrigger: 0
- m_ProvidesContacts: 0
- m_Enabled: 1
- serializedVersion: 3
- m_Height: 1.4
- m_Radius: 0.3
- m_SlopeLimit: 45
- m_StepOffset: 0.3
- m_SkinWidth: 0.08
- m_MinMoveDistance: 0.001
- m_Center: {x: 0, y: 0, z: 0}
--- !u!195 &-5945668371830106230
NavMeshAgent:
m_ObjectHideFlags: 0
@@ -1418,7 +1391,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
enemyTag: Enemy
- speed: 8
+ speed: 4
--- !u!114 &-1799142497566439833
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -1434,8 +1407,6 @@ MonoBehaviour:
startingHealth: 85
currentHealth: 0
sinkSpeed: 2.5
- deathClip: {fileID: 8300000, guid: fd27dad5b50788d49834b1ba9c84b66a, type: 3}
- audioSource: {fileID: 0}
--- !u!114 &-6720398473314893630
MonoBehaviour:
m_ObjectHideFlags: 0
diff --git a/Assets/_CompletedAssets/Prefabs/Pet/Attacker/Mon_00.prefab b/Assets/_CompletedAssets/Prefabs/Pet/Attacker/Mon_00.prefab
index c2fa5edfcf5fad56a93f0dc84fcd2393418ad87b..37f154c0364a1823a3dea42e58dd083542be2110 100644
--- a/Assets/_CompletedAssets/Prefabs/Pet/Attacker/Mon_00.prefab
+++ b/Assets/_CompletedAssets/Prefabs/Pet/Attacker/Mon_00.prefab
@@ -30484,7 +30484,6 @@ GameObject:
- component: {fileID: 95448628147039386}
- component: {fileID: 288825814079066863}
- component: {fileID: 2606097942900706411}
- - component: {fileID: 868206171758275687}
- component: {fileID: -90680836737177195}
- component: {fileID: 6977853715604528539}
- component: {fileID: 5535656724074623742}
@@ -30585,32 +30584,6 @@ Rigidbody:
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
---- !u!143 &868206171758275687
-CharacterController:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1818861082154570}
- m_Material: {fileID: 0}
- m_IncludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_ExcludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_LayerOverridePriority: 0
- m_IsTrigger: 0
- m_ProvidesContacts: 0
- m_Enabled: 1
- serializedVersion: 3
- m_Height: 0.8
- m_Radius: 0.2
- m_SlopeLimit: 45
- m_StepOffset: 0.3
- m_SkinWidth: 0.08
- m_MinMoveDistance: 0.001
- m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &-90680836737177195
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -30640,7 +30613,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
enemyTag: Enemy
- speed: 8
+ speed: 4
--- !u!114 &5535656724074623742
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -30656,8 +30629,6 @@ MonoBehaviour:
startingHealth: 30
currentHealth: 0
sinkSpeed: 2.5
- deathClip: {fileID: 8300000, guid: fd27dad5b50788d49834b1ba9c84b66a, type: 3}
- audioSource: {fileID: 0}
--- !u!114 &5096454626206809716
MonoBehaviour:
m_ObjectHideFlags: 0
diff --git a/Assets/_CompletedAssets/Prefabs/Pet/Buffer/Bat_Red.prefab b/Assets/_CompletedAssets/Prefabs/Pet/Buffer/Bat_Red.prefab
index 09a59546b4cfd3da38b3a6bc2571b7f201a5dcf6..41171169c344271b0b47742fb920a5765321683b 100644
--- a/Assets/_CompletedAssets/Prefabs/Pet/Buffer/Bat_Red.prefab
+++ b/Assets/_CompletedAssets/Prefabs/Pet/Buffer/Bat_Red.prefab
@@ -522,7 +522,6 @@ GameObject:
- component: {fileID: 95000011442643512}
- component: {fileID: -2438550300406464463}
- component: {fileID: -1716173660821927343}
- - component: {fileID: -520469545349112361}
- component: {fileID: 8726267044990597298}
- component: {fileID: -3523106145838518316}
- component: {fileID: -2414361674754636571}
@@ -620,32 +619,6 @@ NavMeshAgent:
m_BaseOffset: 0
m_WalkableMask: 4294967295
m_ObstacleAvoidanceType: 4
---- !u!143 &-520469545349112361
-CharacterController:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1000011593744314}
- m_Material: {fileID: 0}
- m_IncludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_ExcludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_LayerOverridePriority: 0
- m_IsTrigger: 0
- m_ProvidesContacts: 0
- m_Enabled: 1
- serializedVersion: 3
- m_Height: 0.03
- m_Radius: 0.01
- m_SlopeLimit: 45
- m_StepOffset: 0.2
- m_SkinWidth: 0.08
- m_MinMoveDistance: 0.001
- m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &8726267044990597298
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -658,7 +631,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5f698e64a5c0d19448e84cee66f4ec03, type: 3}
m_Name:
m_EditorClassIdentifier:
- enemyTag: Enemy
owner: {fileID: 0}
--- !u!114 &-3523106145838518316
MonoBehaviour:
@@ -672,7 +644,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9f40f356eecbe5745852d08c63d9b718, type: 3}
m_Name:
m_EditorClassIdentifier:
- speed: 5
+ speed: 3
--- !u!114 &-2414361674754636571
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -688,8 +660,6 @@ MonoBehaviour:
startingHealth: 50
currentHealth: 0
sinkSpeed: 2.5
- deathClip: {fileID: 8300000, guid: fd27dad5b50788d49834b1ba9c84b66a, type: 3}
- audioSource: {fileID: 0}
--- !u!1 &1000011643250032
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/_CompletedAssets/Prefabs/Pet/Buffer/SlimePBR.prefab b/Assets/_CompletedAssets/Prefabs/Pet/Buffer/SlimePBR.prefab
index 3604d7c8ca5bc28faa68b9ca218356f032f0bf8d..222f3bf542e38d015133ba2125c013887af2c7a4 100644
--- a/Assets/_CompletedAssets/Prefabs/Pet/Buffer/SlimePBR.prefab
+++ b/Assets/_CompletedAssets/Prefabs/Pet/Buffer/SlimePBR.prefab
@@ -425,7 +425,6 @@ GameObject:
- component: {fileID: 4047972025199878}
- component: {fileID: 95457531584545886}
- component: {fileID: 8948644351380981156}
- - component: {fileID: 5134289613416883480}
- component: {fileID: 5223136862571841449}
- component: {fileID: -7429111866415534856}
- component: {fileID: 7131411868633399835}
@@ -497,32 +496,6 @@ NavMeshAgent:
m_BaseOffset: 0
m_WalkableMask: 4294967295
m_ObstacleAvoidanceType: 4
---- !u!143 &5134289613416883480
-CharacterController:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1931298151966786}
- m_Material: {fileID: 0}
- m_IncludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_ExcludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_LayerOverridePriority: 0
- m_IsTrigger: 0
- m_ProvidesContacts: 0
- m_Enabled: 1
- serializedVersion: 3
- m_Height: 2
- m_Radius: 0.5
- m_SlopeLimit: 45
- m_StepOffset: 0.3
- m_SkinWidth: 0.08
- m_MinMoveDistance: 0.001
- m_Center: {x: 0, y: 0, z: 0}
--- !u!54 &5223136862571841449
Rigidbody:
m_ObjectHideFlags: 0
@@ -562,7 +535,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9f40f356eecbe5745852d08c63d9b718, type: 3}
m_Name:
m_EditorClassIdentifier:
- speed: 5
+ speed: 2
--- !u!114 &7131411868633399835
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -575,11 +548,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 01e8ce3c8afbce546a92d03312d122a7, type: 3}
m_Name:
m_EditorClassIdentifier:
- startingHealth: 50
+ startingHealth: 35
currentHealth: 0
sinkSpeed: 2.5
- deathClip: {fileID: 8300000, guid: fd27dad5b50788d49834b1ba9c84b66a, type: 3}
- audioSource: {fileID: 0}
--- !u!114 &3579222481967298280
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -592,5 +563,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5f698e64a5c0d19448e84cee66f4ec03, type: 3}
m_Name:
m_EditorClassIdentifier:
- enemyTag: Enemy
owner: {fileID: 0}
diff --git a/Assets/_CompletedAssets/Prefabs/Pet/Buffer/TurtleShellPBR.prefab b/Assets/_CompletedAssets/Prefabs/Pet/Buffer/TurtleShellPBR.prefab
index 17ff9e897c1c916ac5650e47b72e3c2a411195d3..322d5b77ea070f870000da04c87ba31233fba160 100644
--- a/Assets/_CompletedAssets/Prefabs/Pet/Buffer/TurtleShellPBR.prefab
+++ b/Assets/_CompletedAssets/Prefabs/Pet/Buffer/TurtleShellPBR.prefab
@@ -518,7 +518,6 @@ GameObject:
- component: {fileID: 95706204029656638}
- component: {fileID: 1106516205442250391}
- component: {fileID: -5372632289170259910}
- - component: {fileID: 6133341345591018961}
- component: {fileID: -2426896539005036984}
- component: {fileID: 3485027913414794960}
- component: {fileID: 6515894746609809605}
@@ -616,32 +615,6 @@ Rigidbody:
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
---- !u!143 &6133341345591018961
-CharacterController:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1524411113276028}
- m_Material: {fileID: 0}
- m_IncludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_ExcludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_LayerOverridePriority: 0
- m_IsTrigger: 0
- m_ProvidesContacts: 0
- m_Enabled: 1
- serializedVersion: 3
- m_Height: 1
- m_Radius: 0.5
- m_SlopeLimit: 45
- m_StepOffset: 0.3
- m_SkinWidth: 0.08
- m_MinMoveDistance: 0.001
- m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &-2426896539005036984
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -654,7 +627,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9f40f356eecbe5745852d08c63d9b718, type: 3}
m_Name:
m_EditorClassIdentifier:
- speed: 5
+ speed: 1.5
--- !u!114 &3485027913414794960
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -667,11 +640,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 01e8ce3c8afbce546a92d03312d122a7, type: 3}
m_Name:
m_EditorClassIdentifier:
- startingHealth: 50
+ startingHealth: 65
currentHealth: 0
sinkSpeed: 2.5
- deathClip: {fileID: 8300000, guid: fd27dad5b50788d49834b1ba9c84b66a, type: 3}
- audioSource: {fileID: 0}
--- !u!114 &6515894746609809605
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -684,7 +655,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5f698e64a5c0d19448e84cee66f4ec03, type: 3}
m_Name:
m_EditorClassIdentifier:
- enemyTag: Enemy
owner: {fileID: 0}
--- !u!1 &1532652994627396
GameObject:
diff --git a/Assets/_CompletedAssets/Prefabs/Pet/Healer/Ghost.prefab b/Assets/_CompletedAssets/Prefabs/Pet/Healer/Ghost.prefab
index 4ff3e479ff6d8fdfcb0af1c86834b1d4fb7cd768..7d497b47a927bc9922f7aa4752956fbfa9566dd1 100644
--- a/Assets/_CompletedAssets/Prefabs/Pet/Healer/Ghost.prefab
+++ b/Assets/_CompletedAssets/Prefabs/Pet/Healer/Ghost.prefab
@@ -187,10 +187,6 @@ PrefabInstance:
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 46f311046d2104da8b56be3d0a49a119,
- type: 3}
- insertIndex: -1
- addedObject: {fileID: 2218055026219704195}
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 46f311046d2104da8b56be3d0a49a119,
type: 3}
insertIndex: -1
@@ -226,32 +222,6 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 902125486744929287}
m_PrefabAsset: {fileID: 0}
---- !u!143 &2218055026219704195
-CharacterController:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 19588385245968726}
- m_Material: {fileID: 0}
- m_IncludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_ExcludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_LayerOverridePriority: 0
- m_IsTrigger: 0
- m_ProvidesContacts: 0
- m_Enabled: 1
- serializedVersion: 3
- m_Height: 1
- m_Radius: 0.3
- m_SlopeLimit: 45
- m_StepOffset: 0.3
- m_SkinWidth: 0.08
- m_MinMoveDistance: 0.001
- m_Center: {x: 0, y: 0.4, z: -0.1}
--- !u!95 &2069234913439815857
Animator:
serializedVersion: 5
@@ -334,7 +304,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 137a031435f14704792bd74bc525b77c, type: 3}
m_Name:
m_EditorClassIdentifier:
- moveSpeed: 8
+ moveSpeed: 4
--- !u!114 &-7991905058926754014
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -350,8 +320,6 @@ MonoBehaviour:
startingHealth: 35
currentHealth: 0
sinkSpeed: 2.5
- deathClip: {fileID: 8300000, guid: fd27dad5b50788d49834b1ba9c84b66a, type: 3}
- audioSource: {fileID: 0}
--- !u!114 &-7973154128551763522
MonoBehaviour:
m_ObjectHideFlags: 0
diff --git a/Assets/_CompletedAssets/Prefabs/Pet/Healer/MushroomSmilePBR.prefab b/Assets/_CompletedAssets/Prefabs/Pet/Healer/MushroomSmilePBR.prefab
index c5db04260a0cd869aedfad150035416c7b470cb3..93b46678f1eb54a326ff0a7683bed52d17e91204 100644
--- a/Assets/_CompletedAssets/Prefabs/Pet/Healer/MushroomSmilePBR.prefab
+++ b/Assets/_CompletedAssets/Prefabs/Pet/Healer/MushroomSmilePBR.prefab
@@ -142,7 +142,6 @@ GameObject:
- component: {fileID: 1221083948262841476}
- component: {fileID: 1691260113314563210}
- component: {fileID: 3950212216661384700}
- - component: {fileID: -8206509309814146372}
- component: {fileID: 8397285175264328931}
- component: {fileID: 437417870373635743}
- component: {fileID: -4521361119162165085}
@@ -215,32 +214,6 @@ NavMeshAgent:
m_BaseOffset: 0
m_WalkableMask: 4294967295
m_ObstacleAvoidanceType: 4
---- !u!143 &-8206509309814146372
-CharacterController:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1997902569578628670}
- m_Material: {fileID: 0}
- m_IncludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_ExcludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_LayerOverridePriority: 0
- m_IsTrigger: 0
- m_ProvidesContacts: 0
- m_Enabled: 1
- serializedVersion: 3
- m_Height: 1
- m_Radius: 0.4
- m_SlopeLimit: 45
- m_StepOffset: 0.3
- m_SkinWidth: 0.08
- m_MinMoveDistance: 0.001
- m_Center: {x: 0, y: 0, z: 0}
--- !u!54 &8397285175264328931
Rigidbody:
m_ObjectHideFlags: 0
@@ -295,7 +268,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 137a031435f14704792bd74bc525b77c, type: 3}
m_Name:
m_EditorClassIdentifier:
- moveSpeed: 6
+ moveSpeed: 3
--- !u!114 &-4403744560476453840
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -311,8 +284,6 @@ MonoBehaviour:
startingHealth: 50
currentHealth: 0
sinkSpeed: 2.5
- deathClip: {fileID: 8300000, guid: fd27dad5b50788d49834b1ba9c84b66a, type: 3}
- audioSource: {fileID: 0}
--- !u!82 &-7638597091113200153
AudioSource:
m_ObjectHideFlags: 0
diff --git a/Assets/_CompletedAssets/Prefabs/Pet/Healer/Rabbit_Red.prefab b/Assets/_CompletedAssets/Prefabs/Pet/Healer/Rabbit_Red.prefab
index bfa702c17fdb436b12bbcdee58d5e57b69bf7e9e..ab4fe8b55bdfa513d333c7ea051b82a76cbf3edb 100644
--- a/Assets/_CompletedAssets/Prefabs/Pet/Healer/Rabbit_Red.prefab
+++ b/Assets/_CompletedAssets/Prefabs/Pet/Healer/Rabbit_Red.prefab
@@ -715,7 +715,6 @@ GameObject:
- component: {fileID: 4000011904546786}
- component: {fileID: 95000010583195036}
- component: {fileID: -5314613522240690284}
- - component: {fileID: -5247953486670157654}
- component: {fileID: 7604158359409447683}
- component: {fileID: 5082219338340107193}
- component: {fileID: -2236181162213971531}
@@ -788,32 +787,6 @@ NavMeshAgent:
m_BaseOffset: 0
m_WalkableMask: 4294967295
m_ObstacleAvoidanceType: 4
---- !u!143 &-5247953486670157654
-CharacterController:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1000013767804016}
- m_Material: {fileID: 0}
- m_IncludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_ExcludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_LayerOverridePriority: 0
- m_IsTrigger: 0
- m_ProvidesContacts: 0
- m_Enabled: 1
- serializedVersion: 3
- m_Height: 0.02
- m_Radius: 0.01
- m_SlopeLimit: 45
- m_StepOffset: 0.3
- m_SkinWidth: 0.08
- m_MinMoveDistance: 0.001
- m_Center: {x: 0, y: 0, z: 0}
--- !u!54 &7604158359409447683
Rigidbody:
m_ObjectHideFlags: 0
@@ -868,7 +841,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 137a031435f14704792bd74bc525b77c, type: 3}
m_Name:
m_EditorClassIdentifier:
- moveSpeed: 7
+ moveSpeed: 3.5
--- !u!114 &5040952831542473853
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -884,8 +857,6 @@ MonoBehaviour:
startingHealth: 65
currentHealth: 0
sinkSpeed: 2.5
- deathClip: {fileID: 8300000, guid: fd27dad5b50788d49834b1ba9c84b66a, type: 3}
- audioSource: {fileID: 0}
--- !u!82 &531196523296470144
AudioSource:
m_ObjectHideFlags: 0
diff --git a/Assets/_CompletedAssets/Prefabs/Player.prefab b/Assets/_CompletedAssets/Prefabs/Player.prefab
index 0f49b7b38373fe6213c0f11eff6a6364a39d8612..a581634416006b2691efd9f4d2c5680d606000ec 100644
--- a/Assets/_CompletedAssets/Prefabs/Player.prefab
+++ b/Assets/_CompletedAssets/Prefabs/Player.prefab
@@ -5385,6 +5385,7 @@ GameObject:
- component: {fileID: 11400002}
- component: {fileID: 399669218063535372}
- component: {fileID: 8200002}
+ - component: {fileID: 6685412505551880838}
m_Layer: 0
m_Name: Player
m_TagString: Player
@@ -5634,6 +5635,18 @@ AudioSource:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
+--- !u!114 &6685412505551880838
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 100006}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5fb65716f8d4ea648a62974ddfcc389e, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &100008
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/_CompletedAssets/Scenes/Town3.unity b/Assets/_CompletedAssets/Scenes/Town3.unity
index 23ca78838973c581aa6cfe9e4f95657867da66cd..cbc0450e127bac7cc4e88f1d3ebf969f5e2d9a3a 100644
--- a/Assets/_CompletedAssets/Scenes/Town3.unity
+++ b/Assets/_CompletedAssets/Scenes/Town3.unity
@@ -748,6 +748,11 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
+ - target: {fileID: 8911326907211409165, guid: ad6501a7addac7b479f3d301565fe189,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 8957324513513200387, guid: ad6501a7addac7b479f3d301565fe189,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
diff --git a/Assets/_CompletedAssets/Scripts/Managers/PetManager.cs b/Assets/_CompletedAssets/Scripts/Managers/PetManager.cs
index ec33bab84c39fdeb03088976145a61815d5c1ced..7479c1ebd0a83670098ff6cb72dae076c7e53803 100644
--- a/Assets/_CompletedAssets/Scripts/Managers/PetManager.cs
+++ b/Assets/_CompletedAssets/Scripts/Managers/PetManager.cs
@@ -27,7 +27,6 @@ namespace CompleteProject
void Start()
{
- PlayerPrefs.SetInt("bomb", 1);
// spawn attacker
if (PlayerPrefs.HasKey("dog"))
{
@@ -80,9 +79,25 @@ namespace CompleteProject
{
for (int i = 0; i < petCount; i++)
{
- turtlePrefab.TryGetComponent<Buff>(out var buff);
- buff.owner = owner;
- Instantiate(turtlePrefab, owner.position, owner.rotation);
+ int randomPet = Random.Range(0, 3);
+ if (randomPet == 0)
+ {
+ turtlePrefab.TryGetComponent<Buff>(out var buff);
+ buff.owner = owner;
+ Instantiate(turtlePrefab, owner.position, owner.rotation);
+ }
+ else if (randomPet == 1)
+ {
+ slimePrefab.TryGetComponent<Buff>(out var buff);
+ buff.owner = owner;
+ Instantiate(slimePrefab, owner.position, owner.rotation);
+ }
+ else
+ {
+ batPrefab.TryGetComponent<Buff>(out var buff);
+ buff.owner = owner;
+ Instantiate(batPrefab, owner.position, owner.rotation);
+ }
}
}
void Update()
diff --git a/Assets/_CompletedAssets/Scripts/Player/IgnorePetCollision.cs b/Assets/_CompletedAssets/Scripts/Player/IgnorePetCollision.cs
new file mode 100644
index 0000000000000000000000000000000000000000..05fb0f0f8e0b11249ac1930fb82cdf615db3aee3
--- /dev/null
+++ b/Assets/_CompletedAssets/Scripts/Player/IgnorePetCollision.cs
@@ -0,0 +1,26 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace CompleteProject
+{
+ public class IgnorePetCollision : MonoBehaviour
+ {
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void OnCollisionEnter(Collision collision)
+ {
+ // Check if the colliding GameObject has the player tag
+ if (collision.gameObject.CompareTag("Pet") || collision.gameObject.CompareTag("PetEnemy"))
+ {
+ // Ignore collision with player GameObject
+ Physics.IgnoreCollision(collision.collider, GetComponent<Collider>());
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/_CompletedAssets/Scripts/Pet/PetMisc/tempAttack.cs.meta b/Assets/_CompletedAssets/Scripts/Player/IgnorePetCollision.cs.meta
similarity index 83%
rename from Assets/_CompletedAssets/Scripts/Pet/PetMisc/tempAttack.cs.meta
rename to Assets/_CompletedAssets/Scripts/Player/IgnorePetCollision.cs.meta
index 3fc09cc3c506b453fb48a814653dee8d6a40ad51..7965769d9828267f60485331115415c2a679ab96 100644
--- a/Assets/_CompletedAssets/Scripts/Pet/PetMisc/tempAttack.cs.meta
+++ b/Assets/_CompletedAssets/Scripts/Player/IgnorePetCollision.cs.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 954deb0d191589948a4da96ad018033f
+guid: 5fb65716f8d4ea648a62974ddfcc389e
MonoImporter:
externalObjects: {}
serializedVersion: 2