Skip to content

Commit 6221ae0

Browse files
fernando-cortezfernando-cortez
committed
adding max health & health networkvariable to breakables
1 parent 279e348 commit 6221ae0

File tree

16 files changed

+272
-88
lines changed

16 files changed

+272
-88
lines changed

‎Assets/GameData/Game/BreakableCrystal.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameData/Game/BreakableCrystal/BaseHP.asset

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:91d0103ab97ba1ce721cb53fb473898e223278cd299827570eb2ec9d344f163a
3+
size 407

‎Assets/GameData/Game/BreakableCrystal/BaseHP.asset.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameData/Game/BreakablePillar.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameData/Game/BreakablePillar/BaseHP.asset

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:94d6f2f66c38f80b44fb3c2451fc2120736b8685ed93b3223eb6b1545380f727
3+
size 406

‎Assets/GameData/Game/BreakablePillar/BaseHP.asset.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameData/Game/BreakablePot.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameData/Game/BreakablePot/BaseHP.asset

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:e4ee715ca09c30156b890781af1d726fce76d34784a8b9bd62e84572dc13663c
3+
size 406

‎Assets/GameData/Game/BreakablePot/BaseHP.asset.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameData/Game/EnemySpawner/BaseHP.asset

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:91d0103ab97ba1ce721cb53fb473898e223278cd299827570eb2ec9d344f163a
3-
size 407
2+
oid sha256:94d6f2f66c38f80b44fb3c2451fc2120736b8685ed93b3223eb6b1545380f727
3+
size 406

‎Assets/GameData/Game/EnemySpawner/BaseHP.asset.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Prefabs/Game/BreakablePillar.prefab

+56-9
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ GameObject:
1313
- component: {fileID: -8903857516321632127}
1414
- component: {fileID: 1460791283510277443}
1515
- component: {fileID: 6825752226794478105}
16+
- component: {fileID: 3685607156052711833}
1617
m_Layer: 6
1718
m_Name: BreakablePillar
1819
m_TagString: Untagged
@@ -27,14 +28,14 @@ Transform:
2728
m_PrefabInstance: {fileID: 0}
2829
m_PrefabAsset: {fileID: 0}
2930
m_GameObject: {fileID: 884761565141663561}
31+
serializedVersion: 2
3032
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3133
m_LocalPosition: {x: 0, y: 0, z: 0}
3234
m_LocalScale: {x: 1, y: 1, z: 1}
3335
m_ConstrainProportionsScale: 0
3436
m_Children:
3537
- {fileID: 5054035021295717131}
3638
m_Father: {fileID: 0}
37-
m_RootOrder: 0
3839
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3940
--- !u!114 &-8668463530818694599
4041
MonoBehaviour:
@@ -48,10 +49,19 @@ MonoBehaviour:
4849
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
4950
m_Name:
5051
m_EditorClassIdentifier:
51-
GlobalObjectIdHash: 951099334
52+
GlobalObjectIdHash: 2025222722
53+
InScenePlacedSourceGlobalObjectIdHash: 0
54+
DeferredDespawnTick: 0
55+
Ownership: 1
5256
AlwaysReplicateAsRoot: 0
57+
SynchronizeTransform: 1
58+
ActiveSceneSynchronization: 0
59+
SceneMigrationSynchronization: 1
60+
SpawnWithObservers: 1
5361
DontDestroyWithOwner: 0
5462
AutoObjectParentSync: 1
63+
SyncOwnerTransformWhenParented: 1
64+
AllowOwnerToParent: 0
5565
--- !u!114 &-8903857516321632127
5666
MonoBehaviour:
5767
m_ObjectHideFlags: 0
@@ -64,17 +74,16 @@ MonoBehaviour:
6474
m_Script: {fileID: 11500000, guid: eb44a31731a459546bdf01f1af48173c, type: 3}
6575
m_Name:
6676
m_EditorClassIdentifier:
67-
m_MaxHealth: {fileID: 0}
68-
m_NetworkHealthState: {fileID: 0}
77+
ShowTopMostFoldoutHeaderGroup: 1
78+
m_MaxHealth: {fileID: 11400000, guid: 8e56e91693df2421190b5c79ce9630a6, type: 2}
79+
m_NetworkHealthState: {fileID: 3685607156052711833}
6980
m_Collider: {fileID: 1460791283510277443}
7081
m_SpecialDamageFlags: 6
7182
m_BrokenPrefab: {fileID: 6418514439632820891, guid: 78436b90c00aaab49b4d522550dd9250, type: 3}
7283
m_PrebrokenPrefab: {fileID: 0}
7384
m_BrokenPrefabPos: {fileID: 4505851899529102149}
7485
m_UnbrokenGameObjects:
7586
- {fileID: 3658718798844854089}
76-
IsBroken:
77-
m_InternalValue: 0
7887
--- !u!65 &1460791283510277443
7988
BoxCollider:
8089
m_ObjectHideFlags: 0
@@ -83,9 +92,17 @@ BoxCollider:
8392
m_PrefabAsset: {fileID: 0}
8493
m_GameObject: {fileID: 884761565141663561}
8594
m_Material: {fileID: 0}
95+
m_IncludeLayers:
96+
serializedVersion: 2
97+
m_Bits: 0
98+
m_ExcludeLayers:
99+
serializedVersion: 2
100+
m_Bits: 0
101+
m_LayerOverridePriority: 0
86102
m_IsTrigger: 0
103+
m_ProvidesContacts: 0
87104
m_Enabled: 1
88-
serializedVersion: 2
105+
serializedVersion: 3
89106
m_Size: {x: 3.54, y: 8.287147, z: 3.8}
90107
m_Center: {x: 1.18, y: 4.1465364, z: 2}
91108
--- !u!54 &6825752226794478105
@@ -95,20 +112,47 @@ Rigidbody:
95112
m_PrefabInstance: {fileID: 0}
96113
m_PrefabAsset: {fileID: 0}
97114
m_GameObject: {fileID: 884761565141663561}
98-
serializedVersion: 2
115+
serializedVersion: 4
99116
m_Mass: 1
100117
m_Drag: 0
101118
m_AngularDrag: 0.05
119+
m_CenterOfMass: {x: 0, y: 0, z: 0}
120+
m_InertiaTensor: {x: 1, y: 1, z: 1}
121+
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
122+
m_IncludeLayers:
123+
serializedVersion: 2
124+
m_Bits: 0
125+
m_ExcludeLayers:
126+
serializedVersion: 2
127+
m_Bits: 0
128+
m_ImplicitCom: 1
129+
m_ImplicitTensor: 1
102130
m_UseGravity: 1
103131
m_IsKinematic: 0
104132
m_Interpolate: 0
105133
m_Constraints: 126
106134
m_CollisionDetection: 0
135+
--- !u!114 &3685607156052711833
136+
MonoBehaviour:
137+
m_ObjectHideFlags: 0
138+
m_CorrespondingSourceObject: {fileID: 0}
139+
m_PrefabInstance: {fileID: 0}
140+
m_PrefabAsset: {fileID: 0}
141+
m_GameObject: {fileID: 884761565141663561}
142+
m_Enabled: 1
143+
m_EditorHideFlags: 0
144+
m_Script: {fileID: 11500000, guid: 6733907396f36c44891916e5c62f25a0, type: 3}
145+
m_Name:
146+
m_EditorClassIdentifier:
147+
ShowTopMostFoldoutHeaderGroup: 1
148+
HitPoints:
149+
m_InternalValue: 0
107150
--- !u!1001 &2926384259182416435
108151
PrefabInstance:
109152
m_ObjectHideFlags: 0
110153
serializedVersion: 2
111154
m_Modification:
155+
serializedVersion: 3
112156
m_TransformParent: {fileID: 4505851899529102149}
113157
m_Modifications:
114158
- target: {fileID: 1899106884463111546, guid: db56f0a4295d95540b4d07fcd18c49e9, type: 3}
@@ -160,12 +204,15 @@ PrefabInstance:
160204
value: 0
161205
objectReference: {fileID: 0}
162206
- target: {fileID: 8184890942973508939, guid: db56f0a4295d95540b4d07fcd18c49e9, type: 3}
163-
propertyPath: m_Materials.Array.data[0]
207+
propertyPath: 'm_Materials.Array.data[0]'
164208
value:
165209
objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2}
166210
m_RemovedComponents:
167211
- {fileID: 0}
168212
- {fileID: 0}
213+
m_RemovedGameObjects: []
214+
m_AddedGameObjects: []
215+
m_AddedComponents: []
169216
m_SourcePrefab: {fileID: 100100000, guid: db56f0a4295d95540b4d07fcd18c49e9, type: 3}
170217
--- !u!1 &3658718798844854089 stripped
171218
GameObject:

‎Assets/Prefabs/Game/BreakablePot.prefab

+43-6
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ GameObject:
1212
- component: {fileID: -8668463530818694599}
1313
- component: {fileID: -8903857516321632127}
1414
- component: {fileID: 8991873088713291135}
15+
- component: {fileID: 5185361255833847072}
1516
m_Layer: 6
1617
m_Name: BreakablePot
1718
m_TagString: Untagged
@@ -26,14 +27,14 @@ Transform:
2627
m_PrefabInstance: {fileID: 0}
2728
m_PrefabAsset: {fileID: 0}
2829
m_GameObject: {fileID: 884761565141663561}
30+
serializedVersion: 2
2931
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3032
m_LocalPosition: {x: 0, y: 0, z: 0}
3133
m_LocalScale: {x: 1, y: 1, z: 1}
3234
m_ConstrainProportionsScale: 0
3335
m_Children:
3436
- {fileID: 1927651668276376163}
3537
m_Father: {fileID: 0}
36-
m_RootOrder: 0
3738
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3839
--- !u!114 &-8668463530818694599
3940
MonoBehaviour:
@@ -47,10 +48,19 @@ MonoBehaviour:
4748
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
4849
m_Name:
4950
m_EditorClassIdentifier:
50-
GlobalObjectIdHash: 951099334
51+
GlobalObjectIdHash: 2007482658
52+
InScenePlacedSourceGlobalObjectIdHash: 0
53+
DeferredDespawnTick: 0
54+
Ownership: 0
5155
AlwaysReplicateAsRoot: 0
56+
SynchronizeTransform: 1
57+
ActiveSceneSynchronization: 0
58+
SceneMigrationSynchronization: 1
59+
SpawnWithObservers: 1
5260
DontDestroyWithOwner: 0
5361
AutoObjectParentSync: 1
62+
SyncOwnerTransformWhenParented: 1
63+
AllowOwnerToParent: 0
5464
--- !u!114 &-8903857516321632127
5565
MonoBehaviour:
5666
m_ObjectHideFlags: 0
@@ -63,17 +73,16 @@ MonoBehaviour:
6373
m_Script: {fileID: 11500000, guid: eb44a31731a459546bdf01f1af48173c, type: 3}
6474
m_Name:
6575
m_EditorClassIdentifier:
66-
m_MaxHealth: {fileID: 0}
67-
m_NetworkHealthState: {fileID: 0}
76+
ShowTopMostFoldoutHeaderGroup: 1
77+
m_MaxHealth: {fileID: 11400000, guid: 0ea073444920f455e9b4769e970d81d8, type: 2}
78+
m_NetworkHealthState: {fileID: 5185361255833847072}
6879
m_Collider: {fileID: 8991873088713291135}
6980
m_SpecialDamageFlags: 0
7081
m_BrokenPrefab: {fileID: 1001931975397017578, guid: 03e282e700b05664daab32d4e7965212, type: 3}
7182
m_PrebrokenPrefab: {fileID: 3819967873106414044, guid: 98dce1da5a97464448a4290ecfd75607, type: 3}
7283
m_BrokenPrefabPos: {fileID: 1927651668276376163}
7384
m_UnbrokenGameObjects:
7485
- {fileID: 598843305552521647}
75-
IsBroken:
76-
m_InternalValue: 0
7786
--- !u!136 &8991873088713291135
7887
CapsuleCollider:
7988
m_ObjectHideFlags: 0
@@ -82,17 +91,42 @@ CapsuleCollider:
8291
m_PrefabAsset: {fileID: 0}
8392
m_GameObject: {fileID: 884761565141663561}
8493
m_Material: {fileID: 0}
94+
m_IncludeLayers:
95+
serializedVersion: 2
96+
m_Bits: 0
97+
m_ExcludeLayers:
98+
serializedVersion: 2
99+
m_Bits: 0
100+
m_LayerOverridePriority: 0
85101
m_IsTrigger: 1
102+
m_ProvidesContacts: 0
86103
m_Enabled: 1
104+
serializedVersion: 2
87105
m_Radius: 1
88106
m_Height: 2
89107
m_Direction: 1
90108
m_Center: {x: 0, y: 1, z: 0}
109+
--- !u!114 &5185361255833847072
110+
MonoBehaviour:
111+
m_ObjectHideFlags: 0
112+
m_CorrespondingSourceObject: {fileID: 0}
113+
m_PrefabInstance: {fileID: 0}
114+
m_PrefabAsset: {fileID: 0}
115+
m_GameObject: {fileID: 884761565141663561}
116+
m_Enabled: 1
117+
m_EditorHideFlags: 0
118+
m_Script: {fileID: 11500000, guid: 6733907396f36c44891916e5c62f25a0, type: 3}
119+
m_Name:
120+
m_EditorClassIdentifier:
121+
ShowTopMostFoldoutHeaderGroup: 1
122+
HitPoints:
123+
m_InternalValue: 0
91124
--- !u!1001 &3811502052812393529
92125
PrefabInstance:
93126
m_ObjectHideFlags: 0
94127
serializedVersion: 2
95128
m_Modification:
129+
serializedVersion: 3
96130
m_TransformParent: {fileID: 4505851899529102149}
97131
m_Modifications:
98132
- target: {fileID: -2116509465241817417, guid: e5e46d03def7870439c2e42d5601394c, type: 3}
@@ -153,6 +187,9 @@ PrefabInstance:
153187
objectReference: {fileID: 0}
154188
m_RemovedComponents:
155189
- {fileID: -2116509465241817417, guid: e5e46d03def7870439c2e42d5601394c, type: 3}
190+
m_RemovedGameObjects: []
191+
m_AddedGameObjects: []
192+
m_AddedComponents: []
156193
m_SourcePrefab: {fileID: 100100000, guid: e5e46d03def7870439c2e42d5601394c, type: 3}
157194
--- !u!1 &598843305552521647 stripped
158195
GameObject:

0 commit comments

Comments
 (0)