Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Assets/GameData/Game/BreakableCrystal.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Assets/GameData/Game/BreakableCrystal/BaseHP.asset
Git LFS file not shown
8 changes: 8 additions & 0 deletions Assets/GameData/Game/BreakableCrystal/BaseHP.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/GameData/Game/BreakablePillar.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Assets/GameData/Game/BreakablePillar/BaseHP.asset
Git LFS file not shown
8 changes: 8 additions & 0 deletions Assets/GameData/Game/BreakablePillar/BaseHP.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/GameData/Game/BreakablePot.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Assets/GameData/Game/BreakablePot/BaseHP.asset
Git LFS file not shown
8 changes: 8 additions & 0 deletions Assets/GameData/Game/BreakablePot/BaseHP.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/GameData/Game/EnemySpawner/BaseHP.asset
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Game/EnemySpawner/BaseHP.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

65 changes: 56 additions & 9 deletions Assets/Prefabs/Game/BreakablePillar.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ GameObject:
- component: {fileID: -8903857516321632127}
- component: {fileID: 1460791283510277443}
- component: {fileID: 6825752226794478105}
- component: {fileID: 3685607156052711833}
m_Layer: 6
m_Name: BreakablePillar
m_TagString: Untagged
Expand All @@ -27,14 +28,14 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 884761565141663561}
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:
- {fileID: 5054035021295717131}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &-8668463530818694599
MonoBehaviour:
Expand All @@ -48,10 +49,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Name:
m_EditorClassIdentifier:
GlobalObjectIdHash: 951099334
GlobalObjectIdHash: 2025222722
InScenePlacedSourceGlobalObjectIdHash: 0
DeferredDespawnTick: 0
Ownership: 1
AlwaysReplicateAsRoot: 0
SynchronizeTransform: 1
ActiveSceneSynchronization: 0
SceneMigrationSynchronization: 1
SpawnWithObservers: 1
DontDestroyWithOwner: 0
AutoObjectParentSync: 1
SyncOwnerTransformWhenParented: 1
AllowOwnerToParent: 0
--- !u!114 &-8903857516321632127
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -64,17 +74,16 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: eb44a31731a459546bdf01f1af48173c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_MaxHealth: {fileID: 0}
m_NetworkHealthState: {fileID: 0}
ShowTopMostFoldoutHeaderGroup: 1
m_MaxHealth: {fileID: 11400000, guid: 8e56e91693df2421190b5c79ce9630a6, type: 2}
m_NetworkHealthState: {fileID: 3685607156052711833}
m_Collider: {fileID: 1460791283510277443}
m_SpecialDamageFlags: 6
m_BrokenPrefab: {fileID: 6418514439632820891, guid: 78436b90c00aaab49b4d522550dd9250, type: 3}
m_PrebrokenPrefab: {fileID: 0}
m_BrokenPrefabPos: {fileID: 4505851899529102149}
m_UnbrokenGameObjects:
- {fileID: 3658718798844854089}
IsBroken:
m_InternalValue: 0
--- !u!65 &1460791283510277443
BoxCollider:
m_ObjectHideFlags: 0
Expand All @@ -83,9 +92,17 @@ BoxCollider:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 884761565141663561}
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: 2
serializedVersion: 3
m_Size: {x: 3.54, y: 8.287147, z: 3.8}
m_Center: {x: 1.18, y: 4.1465364, z: 2}
--- !u!54 &6825752226794478105
Expand All @@ -95,20 +112,47 @@ Rigidbody:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 884761565141663561}
serializedVersion: 2
serializedVersion: 4
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_ImplicitCom: 1
m_ImplicitTensor: 1
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 126
m_CollisionDetection: 0
--- !u!114 &3685607156052711833
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 884761565141663561}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6733907396f36c44891916e5c62f25a0, type: 3}
m_Name:
m_EditorClassIdentifier:
ShowTopMostFoldoutHeaderGroup: 1
HitPoints:
m_InternalValue: 0
--- !u!1001 &2926384259182416435
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 4505851899529102149}
m_Modifications:
- target: {fileID: 1899106884463111546, guid: db56f0a4295d95540b4d07fcd18c49e9, type: 3}
Expand Down Expand Up @@ -160,12 +204,15 @@ PrefabInstance:
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8184890942973508939, guid: db56f0a4295d95540b4d07fcd18c49e9, type: 3}
propertyPath: m_Materials.Array.data[0]
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2}
m_RemovedComponents:
- {fileID: 0}
- {fileID: 0}
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: db56f0a4295d95540b4d07fcd18c49e9, type: 3}
--- !u!1 &3658718798844854089 stripped
GameObject:
Expand Down
49 changes: 43 additions & 6 deletions Assets/Prefabs/Game/BreakablePot.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ GameObject:
- component: {fileID: -8668463530818694599}
- component: {fileID: -8903857516321632127}
- component: {fileID: 8991873088713291135}
- component: {fileID: 5185361255833847072}
m_Layer: 6
m_Name: BreakablePot
m_TagString: Untagged
Expand All @@ -26,14 +27,14 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 884761565141663561}
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:
- {fileID: 1927651668276376163}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &-8668463530818694599
MonoBehaviour:
Expand All @@ -47,10 +48,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Name:
m_EditorClassIdentifier:
GlobalObjectIdHash: 951099334
GlobalObjectIdHash: 2007482658
InScenePlacedSourceGlobalObjectIdHash: 0
DeferredDespawnTick: 0
Ownership: 0
AlwaysReplicateAsRoot: 0
SynchronizeTransform: 1
ActiveSceneSynchronization: 0
SceneMigrationSynchronization: 1
SpawnWithObservers: 1
DontDestroyWithOwner: 0
AutoObjectParentSync: 1
SyncOwnerTransformWhenParented: 1
AllowOwnerToParent: 0
--- !u!114 &-8903857516321632127
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -63,17 +73,16 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: eb44a31731a459546bdf01f1af48173c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_MaxHealth: {fileID: 0}
m_NetworkHealthState: {fileID: 0}
ShowTopMostFoldoutHeaderGroup: 1
m_MaxHealth: {fileID: 11400000, guid: 0ea073444920f455e9b4769e970d81d8, type: 2}
m_NetworkHealthState: {fileID: 5185361255833847072}
m_Collider: {fileID: 8991873088713291135}
m_SpecialDamageFlags: 0
m_BrokenPrefab: {fileID: 1001931975397017578, guid: 03e282e700b05664daab32d4e7965212, type: 3}
m_PrebrokenPrefab: {fileID: 3819967873106414044, guid: 98dce1da5a97464448a4290ecfd75607, type: 3}
m_BrokenPrefabPos: {fileID: 1927651668276376163}
m_UnbrokenGameObjects:
- {fileID: 598843305552521647}
IsBroken:
m_InternalValue: 0
--- !u!136 &8991873088713291135
CapsuleCollider:
m_ObjectHideFlags: 0
Expand All @@ -82,17 +91,42 @@ CapsuleCollider:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 884761565141663561}
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: 1
serializedVersion: 2
m_Radius: 1
m_Height: 2
m_Direction: 1
m_Center: {x: 0, y: 1, z: 0}
--- !u!114 &5185361255833847072
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 884761565141663561}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6733907396f36c44891916e5c62f25a0, type: 3}
m_Name:
m_EditorClassIdentifier:
ShowTopMostFoldoutHeaderGroup: 1
HitPoints:
m_InternalValue: 0
--- !u!1001 &3811502052812393529
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 4505851899529102149}
m_Modifications:
- target: {fileID: -2116509465241817417, guid: e5e46d03def7870439c2e42d5601394c, type: 3}
Expand Down Expand Up @@ -153,6 +187,9 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: -2116509465241817417, guid: e5e46d03def7870439c2e42d5601394c, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e5e46d03def7870439c2e42d5601394c, type: 3}
--- !u!1 &598843305552521647 stripped
GameObject:
Expand Down
Loading