펫 평타 2

This commit is contained in:
Ino 2025-05-15 08:33:37 +09:00
parent 7a73812693
commit 38158ee1ab
46 changed files with 90591 additions and 16170 deletions

Binary file not shown.

View File

@ -14,6 +14,7 @@ GameObject:
- component: {fileID: 54785160050736224} - component: {fileID: 54785160050736224}
- component: {fileID: 135257664758760022} - component: {fileID: 135257664758760022}
- component: {fileID: 884496076596888680} - component: {fileID: 884496076596888680}
- component: {fileID: -5050676782129760161}
m_Layer: 0 m_Layer: 0
m_Name: Projectile 1 nature m_Name: Projectile 1 nature
m_TagString: Untagged m_TagString: Untagged
@ -188,6 +189,29 @@ MonoBehaviour:
prefab: {fileID: 884496076596888680} prefab: {fileID: 884496076596888680}
rejoinMode: 1 rejoinMode: 1
delayBeforeAutoRejoin: 3 delayBeforeAutoRejoin: 3
--- !u!114 &-5050676782129760161
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1698648575761504}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Version: 3
m_UsePipelineSettings: 1
m_AdditionalLightsShadowResolutionTier: 2
m_LightLayerMask: 1
m_RenderingLayers: 1
m_CustomShadowLayers: 0
m_ShadowLayerMask: 1
m_ShadowRenderingLayers: 1
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
m_SoftShadowQuality: 0
--- !u!1 &2346762802828925800 --- !u!1 &2346762802828925800
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -5131,7 +5155,8 @@ PrefabInstance:
serializedVersion: 3 serializedVersion: 3
m_TransformParent: {fileID: 1145913884954231855} m_TransformParent: {fileID: 1145913884954231855}
m_Modifications: m_Modifications:
- target: {fileID: -8042464971083744396, guid: a18abcc036ab57445b15bc526991da46, type: 3} - target: {fileID: -8042464971083744396, guid: a18abcc036ab57445b15bc526991da46,
type: 3}
propertyPath: parentObject propertyPath: parentObject
value: value:
objectReference: {fileID: 1145913884954231855} objectReference: {fileID: 1145913884954231855}
@ -5190,12 +5215,14 @@ PrefabInstance:
m_SourcePrefab: {fileID: 100100000, guid: a18abcc036ab57445b15bc526991da46, type: 3} m_SourcePrefab: {fileID: 100100000, guid: a18abcc036ab57445b15bc526991da46, type: 3}
--- !u!4 &5444271128720247424 stripped --- !u!4 &5444271128720247424 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: 4878295977974350, guid: a18abcc036ab57445b15bc526991da46, type: 3} m_CorrespondingSourceObject: {fileID: 4878295977974350, guid: a18abcc036ab57445b15bc526991da46,
type: 3}
m_PrefabInstance: {fileID: 5448435772923924686} m_PrefabInstance: {fileID: 5448435772923924686}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &5447257576979871338 stripped --- !u!1 &5447257576979871338 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 1179295499806372, guid: a18abcc036ab57445b15bc526991da46, type: 3} m_CorrespondingSourceObject: {fileID: 1179295499806372, guid: a18abcc036ab57445b15bc526991da46,
type: 3}
m_PrefabInstance: {fileID: 5448435772923924686} m_PrefabInstance: {fileID: 5448435772923924686}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1001 &5789413519200352211 --- !u!1001 &5789413519200352211
@ -5254,83 +5281,103 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 198133994400257532, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3} - target: {fileID: 198133994400257532, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
propertyPath: playOnAwake propertyPath: playOnAwake
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 198250862225907838, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3} - target: {fileID: 198250862225907838, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
propertyPath: playOnAwake propertyPath: playOnAwake
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 198325540842303604, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3} - target: {fileID: 198325540842303604, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
propertyPath: playOnAwake propertyPath: playOnAwake
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 198456296253770098, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3} - target: {fileID: 198456296253770098, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
propertyPath: playOnAwake propertyPath: playOnAwake
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 198553259374161848, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3} - target: {fileID: 198553259374161848, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
propertyPath: playOnAwake propertyPath: playOnAwake
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 198617890845989572, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3} - target: {fileID: 198617890845989572, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
propertyPath: playOnAwake propertyPath: playOnAwake
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 198652190930494444, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3} - target: {fileID: 198652190930494444, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
propertyPath: playOnAwake propertyPath: playOnAwake
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 198660746562634756, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3} - target: {fileID: 198660746562634756, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
propertyPath: playOnAwake propertyPath: playOnAwake
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 198769213268431180, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3} - target: {fileID: 198769213268431180, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
propertyPath: playOnAwake propertyPath: playOnAwake
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 198980595284397332, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3} - target: {fileID: 198980595284397332, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
propertyPath: playOnAwake propertyPath: playOnAwake
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 199093406649196904, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3} - target: {fileID: 199093406649196904, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
propertyPath: m_Materials.Array.size propertyPath: m_Materials.Array.size
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 199499675225090684, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3} - target: {fileID: 199499675225090684, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
propertyPath: m_Materials.Array.size propertyPath: m_Materials.Array.size
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 199695001564087420, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3} - target: {fileID: 199695001564087420, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
propertyPath: m_Materials.Array.size propertyPath: m_Materials.Array.size
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 199699886376435688, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3} - target: {fileID: 199699886376435688, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
propertyPath: m_Materials.Array.size propertyPath: m_Materials.Array.size
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 199700334656404966, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3} - target: {fileID: 199700334656404966, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
propertyPath: m_Materials.Array.size propertyPath: m_Materials.Array.size
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 199839033946112236, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3} - target: {fileID: 199839033946112236, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
propertyPath: m_Materials.Array.size propertyPath: m_Materials.Array.size
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 199867125231304138, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3} - target: {fileID: 199867125231304138, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
propertyPath: m_Materials.Array.size propertyPath: m_Materials.Array.size
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 199892327733677744, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3} - target: {fileID: 199892327733677744, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
propertyPath: m_Materials.Array.size propertyPath: m_Materials.Array.size
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 199923374425794040, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3} - target: {fileID: 199923374425794040, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
propertyPath: m_Materials.Array.size propertyPath: m_Materials.Array.size
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 199983775170629824, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3} - target: {fileID: 199983775170629824, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
propertyPath: m_Materials.Array.size propertyPath: m_Materials.Array.size
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
@ -5341,16 +5388,19 @@ PrefabInstance:
m_SourcePrefab: {fileID: 100100000, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3}
--- !u!4 &5785182219493029857 stripped --- !u!4 &5785182219493029857 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: 4847196408004658, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3} m_CorrespondingSourceObject: {fileID: 4847196408004658, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
m_PrefabInstance: {fileID: 5789413519200352211} m_PrefabInstance: {fileID: 5789413519200352211}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &5790425898371446225 stripped --- !u!1 &5790425898371446225 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 1012929371636226, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3} m_CorrespondingSourceObject: {fileID: 1012929371636226, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
m_PrefabInstance: {fileID: 5789413519200352211} m_PrefabInstance: {fileID: 5789413519200352211}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!198 &5952036809755333695 stripped --- !u!198 &5952036809755333695 stripped
ParticleSystem: ParticleSystem:
m_CorrespondingSourceObject: {fileID: 198652190930494444, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3} m_CorrespondingSourceObject: {fileID: 198652190930494444, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
m_PrefabInstance: {fileID: 5789413519200352211} m_PrefabInstance: {fileID: 5789413519200352211}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}

View File

@ -14,6 +14,7 @@ GameObject:
- component: {fileID: 54610850387007412} - component: {fileID: 54610850387007412}
- component: {fileID: 135627091332810106} - component: {fileID: 135627091332810106}
- component: {fileID: 5146478344225123630} - component: {fileID: 5146478344225123630}
- component: {fileID: 4984381186209096486}
m_Layer: 0 m_Layer: 0
m_Name: Projectile 22 star sky m_Name: Projectile 22 star sky
m_TagString: Untagged m_TagString: Untagged
@ -189,6 +190,29 @@ MonoBehaviour:
prefab: {fileID: 5146478344225123630} prefab: {fileID: 5146478344225123630}
rejoinMode: 1 rejoinMode: 1
delayBeforeAutoRejoin: 3 delayBeforeAutoRejoin: 3
--- !u!114 &4984381186209096486
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1034045548656336}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Version: 3
m_UsePipelineSettings: 1
m_AdditionalLightsShadowResolutionTier: 2
m_LightLayerMask: 1
m_RenderingLayers: 1
m_CustomShadowLayers: 0
m_ShadowLayerMask: 1
m_ShadowRenderingLayers: 1
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
m_SoftShadowQuality: 0
--- !u!1 &1512875676520532 --- !u!1 &1512875676520532
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -14902,43 +14926,53 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 198774438477885910, guid: c5a11cdca0c02ec46af89a4f25515b5f, type: 3} - target: {fileID: 198774438477885910, guid: c5a11cdca0c02ec46af89a4f25515b5f,
type: 3}
propertyPath: playOnAwake propertyPath: playOnAwake
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 198812080756969636, guid: c5a11cdca0c02ec46af89a4f25515b5f, type: 3} - target: {fileID: 198812080756969636, guid: c5a11cdca0c02ec46af89a4f25515b5f,
type: 3}
propertyPath: playOnAwake propertyPath: playOnAwake
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 198877030427377042, guid: c5a11cdca0c02ec46af89a4f25515b5f, type: 3} - target: {fileID: 198877030427377042, guid: c5a11cdca0c02ec46af89a4f25515b5f,
type: 3}
propertyPath: playOnAwake propertyPath: playOnAwake
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 198897076115281150, guid: c5a11cdca0c02ec46af89a4f25515b5f, type: 3} - target: {fileID: 198897076115281150, guid: c5a11cdca0c02ec46af89a4f25515b5f,
type: 3}
propertyPath: playOnAwake propertyPath: playOnAwake
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 198907091164471868, guid: c5a11cdca0c02ec46af89a4f25515b5f, type: 3} - target: {fileID: 198907091164471868, guid: c5a11cdca0c02ec46af89a4f25515b5f,
type: 3}
propertyPath: playOnAwake propertyPath: playOnAwake
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 199513054164512262, guid: c5a11cdca0c02ec46af89a4f25515b5f, type: 3} - target: {fileID: 199513054164512262, guid: c5a11cdca0c02ec46af89a4f25515b5f,
type: 3}
propertyPath: m_Materials.Array.size propertyPath: m_Materials.Array.size
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 199731819714536816, guid: c5a11cdca0c02ec46af89a4f25515b5f, type: 3} - target: {fileID: 199731819714536816, guid: c5a11cdca0c02ec46af89a4f25515b5f,
type: 3}
propertyPath: m_Materials.Array.size propertyPath: m_Materials.Array.size
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 199774004804777172, guid: c5a11cdca0c02ec46af89a4f25515b5f, type: 3} - target: {fileID: 199774004804777172, guid: c5a11cdca0c02ec46af89a4f25515b5f,
type: 3}
propertyPath: m_Materials.Array.size propertyPath: m_Materials.Array.size
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 199809890537788622, guid: c5a11cdca0c02ec46af89a4f25515b5f, type: 3} - target: {fileID: 199809890537788622, guid: c5a11cdca0c02ec46af89a4f25515b5f,
type: 3}
propertyPath: m_Materials.Array.size propertyPath: m_Materials.Array.size
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 199995701735307744, guid: c5a11cdca0c02ec46af89a4f25515b5f, type: 3} - target: {fileID: 199995701735307744, guid: c5a11cdca0c02ec46af89a4f25515b5f,
type: 3}
propertyPath: m_Materials.Array.size propertyPath: m_Materials.Array.size
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
@ -14949,17 +14983,20 @@ PrefabInstance:
m_SourcePrefab: {fileID: 100100000, guid: c5a11cdca0c02ec46af89a4f25515b5f, type: 3} m_SourcePrefab: {fileID: 100100000, guid: c5a11cdca0c02ec46af89a4f25515b5f, type: 3}
--- !u!198 &2109385354712841312 stripped --- !u!198 &2109385354712841312 stripped
ParticleSystem: ParticleSystem:
m_CorrespondingSourceObject: {fileID: 198897076115281150, guid: c5a11cdca0c02ec46af89a4f25515b5f, type: 3} m_CorrespondingSourceObject: {fileID: 198897076115281150, guid: c5a11cdca0c02ec46af89a4f25515b5f,
type: 3}
m_PrefabInstance: {fileID: 2271104057892858014} m_PrefabInstance: {fileID: 2271104057892858014}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &2271850034188334630 stripped --- !u!1 &2271850034188334630 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 1036333269638840, guid: c5a11cdca0c02ec46af89a4f25515b5f, type: 3} m_CorrespondingSourceObject: {fileID: 1036333269638840, guid: c5a11cdca0c02ec46af89a4f25515b5f,
type: 3}
m_PrefabInstance: {fileID: 2271104057892858014} m_PrefabInstance: {fileID: 2271104057892858014}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!4 &2275876696472762786 stripped --- !u!4 &2275876696472762786 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: 4816786620928316, guid: c5a11cdca0c02ec46af89a4f25515b5f, type: 3} m_CorrespondingSourceObject: {fileID: 4816786620928316, guid: c5a11cdca0c02ec46af89a4f25515b5f,
type: 3}
m_PrefabInstance: {fileID: 2271104057892858014} m_PrefabInstance: {fileID: 2271104057892858014}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1001 &4446529750877463738 --- !u!1001 &4446529750877463738
@ -14970,7 +15007,8 @@ PrefabInstance:
serializedVersion: 3 serializedVersion: 3
m_TransformParent: {fileID: 678054757306626905} m_TransformParent: {fileID: 678054757306626905}
m_Modifications: m_Modifications:
- target: {fileID: -2873217483179549716, guid: 1702711b22bc3204d80c7f85a3de0c80, type: 3} - target: {fileID: -2873217483179549716, guid: 1702711b22bc3204d80c7f85a3de0c80,
type: 3}
propertyPath: parentObject propertyPath: parentObject
value: value:
objectReference: {fileID: 678054757306626905} objectReference: {fileID: 678054757306626905}
@ -15022,19 +15060,23 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 199030250282937850, guid: 1702711b22bc3204d80c7f85a3de0c80, type: 3} - target: {fileID: 199030250282937850, guid: 1702711b22bc3204d80c7f85a3de0c80,
type: 3}
propertyPath: m_Materials.Array.size propertyPath: m_Materials.Array.size
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 199420838267921144, guid: 1702711b22bc3204d80c7f85a3de0c80, type: 3} - target: {fileID: 199420838267921144, guid: 1702711b22bc3204d80c7f85a3de0c80,
type: 3}
propertyPath: m_Materials.Array.size propertyPath: m_Materials.Array.size
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 199464122905362346, guid: 1702711b22bc3204d80c7f85a3de0c80, type: 3} - target: {fileID: 199464122905362346, guid: 1702711b22bc3204d80c7f85a3de0c80,
type: 3}
propertyPath: m_Materials.Array.size propertyPath: m_Materials.Array.size
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 199976093604397450, guid: 1702711b22bc3204d80c7f85a3de0c80, type: 3} - target: {fileID: 199976093604397450, guid: 1702711b22bc3204d80c7f85a3de0c80,
type: 3}
propertyPath: m_Materials.Array.size propertyPath: m_Materials.Array.size
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
@ -15045,11 +15087,13 @@ PrefabInstance:
m_SourcePrefab: {fileID: 100100000, guid: 1702711b22bc3204d80c7f85a3de0c80, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 1702711b22bc3204d80c7f85a3de0c80, type: 3}
--- !u!1 &4445584173576148590 stripped --- !u!1 &4445584173576148590 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 1368339559166676, guid: 1702711b22bc3204d80c7f85a3de0c80, type: 3} m_CorrespondingSourceObject: {fileID: 1368339559166676, guid: 1702711b22bc3204d80c7f85a3de0c80,
type: 3}
m_PrefabInstance: {fileID: 4446529750877463738} m_PrefabInstance: {fileID: 4446529750877463738}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!4 &4448354358254198358 stripped --- !u!4 &4448354358254198358 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: 4087466731289324, guid: 1702711b22bc3204d80c7f85a3de0c80, type: 3} m_CorrespondingSourceObject: {fileID: 4087466731289324, guid: 1702711b22bc3204d80c7f85a3de0c80,
type: 3}
m_PrefabInstance: {fileID: 4446529750877463738} m_PrefabInstance: {fileID: 4446529750877463738}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}

View File

@ -14,6 +14,7 @@ GameObject:
- component: {fileID: 54637759880830186} - component: {fileID: 54637759880830186}
- component: {fileID: 135729131846127588} - component: {fileID: 135729131846127588}
- component: {fileID: 6570909629399998744} - component: {fileID: 6570909629399998744}
- component: {fileID: 6654815482416436682}
m_Layer: 0 m_Layer: 0
m_Name: Projectile 24 honey m_Name: Projectile 24 honey
m_TagString: Untagged m_TagString: Untagged
@ -189,6 +190,29 @@ MonoBehaviour:
prefab: {fileID: 6570909629399998744} prefab: {fileID: 6570909629399998744}
rejoinMode: 1 rejoinMode: 1
delayBeforeAutoRejoin: 3 delayBeforeAutoRejoin: 3
--- !u!114 &6654815482416436682
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1253354654402752}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Version: 3
m_UsePipelineSettings: 1
m_AdditionalLightsShadowResolutionTier: 2
m_LightLayerMask: 1
m_RenderingLayers: 1
m_CustomShadowLayers: 0
m_ShadowLayerMask: 1
m_ShadowRenderingLayers: 1
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
m_SoftShadowQuality: 0
--- !u!1 &1864313438439992 --- !u!1 &1864313438439992
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -9983,7 +10007,8 @@ PrefabInstance:
serializedVersion: 3 serializedVersion: 3
m_TransformParent: {fileID: 3755256461616941106} m_TransformParent: {fileID: 3755256461616941106}
m_Modifications: m_Modifications:
- target: {fileID: -8005840327144411096, guid: 155a6e65975c2834a85ca6e20ce89621, type: 3} - target: {fileID: -8005840327144411096, guid: 155a6e65975c2834a85ca6e20ce89621,
type: 3}
propertyPath: parentObject propertyPath: parentObject
value: value:
objectReference: {fileID: 3755256461616941106} objectReference: {fileID: 3755256461616941106}
@ -10042,12 +10067,14 @@ PrefabInstance:
m_SourcePrefab: {fileID: 100100000, guid: 155a6e65975c2834a85ca6e20ce89621, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 155a6e65975c2834a85ca6e20ce89621, type: 3}
--- !u!4 &652817004687942097 stripped --- !u!4 &652817004687942097 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: 4705243768242912, guid: 155a6e65975c2834a85ca6e20ce89621, type: 3} m_CorrespondingSourceObject: {fileID: 4705243768242912, guid: 155a6e65975c2834a85ca6e20ce89621,
type: 3}
m_PrefabInstance: {fileID: 657511250009334577} m_PrefabInstance: {fileID: 657511250009334577}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &656269039881836213 stripped --- !u!1 &656269039881836213 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 1262005199533444, guid: 155a6e65975c2834a85ca6e20ce89621, type: 3} m_CorrespondingSourceObject: {fileID: 1262005199533444, guid: 155a6e65975c2834a85ca6e20ce89621,
type: 3}
m_PrefabInstance: {fileID: 657511250009334577} m_PrefabInstance: {fileID: 657511250009334577}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1001 &5046877625812784604 --- !u!1001 &5046877625812784604
@ -10106,43 +10133,53 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 198023630682624238, guid: 5f609255c5be93c4a8f34b880b754eac, type: 3} - target: {fileID: 198023630682624238, guid: 5f609255c5be93c4a8f34b880b754eac,
type: 3}
propertyPath: playOnAwake propertyPath: playOnAwake
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 198318526731408938, guid: 5f609255c5be93c4a8f34b880b754eac, type: 3} - target: {fileID: 198318526731408938, guid: 5f609255c5be93c4a8f34b880b754eac,
type: 3}
propertyPath: playOnAwake propertyPath: playOnAwake
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 198377757560196472, guid: 5f609255c5be93c4a8f34b880b754eac, type: 3} - target: {fileID: 198377757560196472, guid: 5f609255c5be93c4a8f34b880b754eac,
type: 3}
propertyPath: playOnAwake propertyPath: playOnAwake
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 198384717363174522, guid: 5f609255c5be93c4a8f34b880b754eac, type: 3} - target: {fileID: 198384717363174522, guid: 5f609255c5be93c4a8f34b880b754eac,
type: 3}
propertyPath: playOnAwake propertyPath: playOnAwake
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 198683385121164398, guid: 5f609255c5be93c4a8f34b880b754eac, type: 3} - target: {fileID: 198683385121164398, guid: 5f609255c5be93c4a8f34b880b754eac,
type: 3}
propertyPath: playOnAwake propertyPath: playOnAwake
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 199112902095261026, guid: 5f609255c5be93c4a8f34b880b754eac, type: 3} - target: {fileID: 199112902095261026, guid: 5f609255c5be93c4a8f34b880b754eac,
type: 3}
propertyPath: m_Materials.Array.size propertyPath: m_Materials.Array.size
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 199270912018459730, guid: 5f609255c5be93c4a8f34b880b754eac, type: 3} - target: {fileID: 199270912018459730, guid: 5f609255c5be93c4a8f34b880b754eac,
type: 3}
propertyPath: m_Materials.Array.size propertyPath: m_Materials.Array.size
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 199556376110033028, guid: 5f609255c5be93c4a8f34b880b754eac, type: 3} - target: {fileID: 199556376110033028, guid: 5f609255c5be93c4a8f34b880b754eac,
type: 3}
propertyPath: m_Materials.Array.size propertyPath: m_Materials.Array.size
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 199647319047858990, guid: 5f609255c5be93c4a8f34b880b754eac, type: 3} - target: {fileID: 199647319047858990, guid: 5f609255c5be93c4a8f34b880b754eac,
type: 3}
propertyPath: m_Materials.Array.size propertyPath: m_Materials.Array.size
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 199937337011210922, guid: 5f609255c5be93c4a8f34b880b754eac, type: 3} - target: {fileID: 199937337011210922, guid: 5f609255c5be93c4a8f34b880b754eac,
type: 3}
propertyPath: m_Materials.Array.size propertyPath: m_Materials.Array.size
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
@ -10153,16 +10190,19 @@ PrefabInstance:
m_SourcePrefab: {fileID: 100100000, guid: 5f609255c5be93c4a8f34b880b754eac, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 5f609255c5be93c4a8f34b880b754eac, type: 3}
--- !u!198 &4957268065686084018 stripped --- !u!198 &4957268065686084018 stripped
ParticleSystem: ParticleSystem:
m_CorrespondingSourceObject: {fileID: 198683385121164398, guid: 5f609255c5be93c4a8f34b880b754eac, type: 3} m_CorrespondingSourceObject: {fileID: 198683385121164398, guid: 5f609255c5be93c4a8f34b880b754eac,
type: 3}
m_PrefabInstance: {fileID: 5046877625812784604} m_PrefabInstance: {fileID: 5046877625812784604}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &5048289025118751708 stripped --- !u!1 &5048289025118751708 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 1473797069004288, guid: 5f609255c5be93c4a8f34b880b754eac, type: 3} m_CorrespondingSourceObject: {fileID: 1473797069004288, guid: 5f609255c5be93c4a8f34b880b754eac,
type: 3}
m_PrefabInstance: {fileID: 5046877625812784604} m_PrefabInstance: {fileID: 5046877625812784604}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!4 &5051766158997152790 stripped --- !u!4 &5051766158997152790 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: 4898291756921290, guid: 5f609255c5be93c4a8f34b880b754eac, type: 3} m_CorrespondingSourceObject: {fileID: 4898291756921290, guid: 5f609255c5be93c4a8f34b880b754eac,
type: 3}
m_PrefabInstance: {fileID: 5046877625812784604} m_PrefabInstance: {fileID: 5046877625812784604}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}

View File

@ -21,15 +21,16 @@ Material:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: Heart3bcg m_Name: Heart3bcg
m_Shader: {fileID: -6465566751694194690, guid: 00191177e5fd5c4468ad546ce87ef329, type: 3} m_Shader: {fileID: -6465566751694194690, guid: 00191177e5fd5c4468ad546ce87ef329,
type: 3}
m_Parent: {fileID: 0} m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0 m_ModifiedSerializedProperties: 0
m_ValidKeywords: m_ValidKeywords:
- _BUILTIN_SURFACE_TYPE_TRANSPARENT - _BUILTIN_SURFACE_TYPE_TRANSPARENT
- _ENABLE_FOG_ON_TRANSPARENT
- _SURFACE_TYPE_TRANSPARENT - _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords: m_InvalidKeywords:
- _DOUBLESIDED_ON - _DOUBLESIDED_ON
- _ENABLE_FOG_ON_TRANSPARENT
- _USEDEPTH_ON - _USEDEPTH_ON
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
@ -43,6 +44,8 @@ Material:
- TransparentDepthPostpass - TransparentDepthPostpass
- TransparentBackface - TransparentBackface
- MOTIONVECTORS - MOTIONVECTORS
- DepthOnly
- SHADOWCASTER
m_LockedProperties: m_LockedProperties:
m_SavedProperties: m_SavedProperties:
serializedVersion: 3 serializedVersion: 3
@ -117,10 +120,10 @@ Material:
- _ExcludeFromTUAndAA: 0 - _ExcludeFromTUAndAA: 0
- _Opacity: 3 - _Opacity: 3
- _OpaqueCullMode: 2 - _OpaqueCullMode: 2
- _QueueControl: -1 - _QueueControl: 0
- _QueueOffset: 0 - _QueueOffset: 0
- _RenderQueueType: 3 - _RenderQueueType: 3
- _SrcBlend: 1 - _SrcBlend: 5
- _StencilRef: 0 - _StencilRef: 0
- _StencilRefDepth: 1 - _StencilRefDepth: 1
- _StencilRefDistortionVec: 4 - _StencilRefDistortionVec: 4

View File

@ -50,15 +50,16 @@ Material:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: Trails65bcg m_Name: Trails65bcg
m_Shader: {fileID: -6465566751694194690, guid: 00191177e5fd5c4468ad546ce87ef329, type: 3} m_Shader: {fileID: -6465566751694194690, guid: 00191177e5fd5c4468ad546ce87ef329,
type: 3}
m_Parent: {fileID: 0} m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0 m_ModifiedSerializedProperties: 0
m_ValidKeywords: m_ValidKeywords:
- _BUILTIN_SURFACE_TYPE_TRANSPARENT - _BUILTIN_SURFACE_TYPE_TRANSPARENT
- _ENABLE_FOG_ON_TRANSPARENT
- _SURFACE_TYPE_TRANSPARENT - _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords: m_InvalidKeywords:
- _DOUBLESIDED_ON - _DOUBLESIDED_ON
- _ENABLE_FOG_ON_TRANSPARENT
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 1 m_DoubleSidedGI: 1
@ -71,6 +72,8 @@ Material:
- TransparentDepthPostpass - TransparentDepthPostpass
- TransparentBackface - TransparentBackface
- MOTIONVECTORS - MOTIONVECTORS
- DepthOnly
- SHADOWCASTER
m_LockedProperties: m_LockedProperties:
m_SavedProperties: m_SavedProperties:
serializedVersion: 3 serializedVersion: 3
@ -201,12 +204,12 @@ Material:
- _Opacity: 3 - _Opacity: 3
- _OpaqueCullMode: 2 - _OpaqueCullMode: 2
- _Parallax: 0.02 - _Parallax: 0.02
- _QueueControl: -1 - _QueueControl: 0
- _QueueOffset: 0 - _QueueOffset: 0
- _RenderQueueType: 3 - _RenderQueueType: 3
- _SmoothnessTextureChannel: 0 - _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1 - _SpecularHighlights: 1
- _SrcBlend: 1 - _SrcBlend: 5
- _StencilRef: 0 - _StencilRef: 0
- _StencilRefDepth: 1 - _StencilRefDepth: 1
- _StencilRefDistortionVec: 4 - _StencilRefDistortionVec: 4

View File

@ -1,6 +1,5 @@
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.Pool;
namespace CGT.Pooling namespace CGT.Pooling
{ {
@ -8,11 +7,7 @@ namespace CGT.Pooling
{ {
[SerializeField] protected int defaultPoolCapacity = 5; [SerializeField] protected int defaultPoolCapacity = 5;
[SerializeField] protected int maxPoolCapacity = 20; [SerializeField] protected int maxPoolCapacity = 20;
[SerializeField] protected bool collectionCheck = true;
/// <summary>
/// Makes sure at least one VFXManager exists, returning the first one found
/// </summary>
public static HS_PoolableManager EnsureExists() public static HS_PoolableManager EnsureExists()
{ {
HS_PoolableManager manager = FindObjectOfType<HS_PoolableManager>(); HS_PoolableManager manager = FindObjectOfType<HS_PoolableManager>();
@ -21,118 +16,85 @@ namespace CGT.Pooling
string managerName = "CGT_ObjectPoolManager"; string managerName = "CGT_ObjectPoolManager";
GameObject managerGO = new GameObject(managerName); GameObject managerGO = new GameObject(managerName);
manager = managerGO.AddComponent<HS_PoolableManager>(); manager = managerGO.AddComponent<HS_PoolableManager>();
// ^We init it here to deal with potential race conditions, what with
// how we're making this system manage itself
} }
return manager; return manager;
} }
protected virtual void Awake() protected virtual void Awake()
{ {
transform.position = Vector3.zero; transform.position = Vector3.zero;
// ^So that when things are instantiated, they're initially in the world coords
// specified in their prefabs
DontDestroyOnLoad(this.gameObject); DontDestroyOnLoad(this.gameObject);
} }
public virtual HS_Poolable GetInstanceOf(HS_Poolable prefab) public virtual HS_Poolable GetInstanceOf(HS_Poolable prefab)
{ {
// We want to have a separate pool for every prefab so we know if (!poolsPerPrefab.ContainsKey(prefab))
// where to get instances from
IObjectPool<HS_Poolable> pool = GetPoolFor(prefab);
toCreateInstanceFrom = prefab;
HS_Poolable instance = pool.Get();
return instance;
}
protected virtual IObjectPool<HS_Poolable> GetPoolFor(HS_Poolable prefab)
{
bool poolSetUpAlready = poolsPerPrefab.ContainsKey(prefab);
if (!poolSetUpAlready)
{ {
PrepareNewPoolFor(prefab); PrepareNewPoolFor(prefab);
} }
IObjectPool<HS_Poolable> pool = poolsPerPrefab[prefab]; Queue<HS_Poolable> pool = poolsPerPrefab[prefab];
return pool; HS_Poolable instance = null;
if (pool.Count > 0)
{
instance = pool.Dequeue();
}
else
{
instance = CreatePoolable(prefab);
}
instance.gameObject.SetActive(false); // Let user activate manually
return instance;
} }
protected IDictionary<HS_Poolable, IObjectPool<HS_Poolable>> poolsPerPrefab = public virtual void ReturnToPool(HS_Poolable instance)
new Dictionary<HS_Poolable, IObjectPool<HS_Poolable>>(); {
HS_Poolable prefab = instance.Prefab;
if (!poolsPerPrefab.ContainsKey(prefab))
{
PrepareNewPoolFor(prefab);
}
instance.transform.SetParent(poolHolders[prefab]);
instance.gameObject.SetActive(false);
poolsPerPrefab[prefab].Enqueue(instance);
}
protected virtual void PrepareNewPoolFor(HS_Poolable prefab) protected virtual void PrepareNewPoolFor(HS_Poolable prefab)
{ {
//IObjectPool<HS_Poolable> pool = new ObjectPool<HS_Poolable> poolsPerPrefab[prefab] = new Queue<HS_Poolable>(defaultPoolCapacity);
// (
// createFunc: CreatePoolable,
// actionOnGet: OnGetPoolableFromPool,
// actionOnRelease: OnReturnToPool,
// actionOnDestroy: OnPoolableDestroyed,
// collectionCheck: collectionCheck,
// defaultCapacity: defaultPoolCapacity,
// maxSize: maxPoolCapacity
// );
//poolsPerPrefab.Add(prefab, pool); GameObject holderGO = new GameObject($"{prefab.name} Pool");
Transform holderTrans = holderGO.transform;
//// We want the objects to be parented to this manager to make it easier for the holderTrans.SetParent(this.transform);
//// user to keep track of them in Play Mode poolHolders[prefab] = holderGO.transform;
//string newPoolName = $"{prefab.name} Pool"; instancesCreated[prefab] = 0;
//GameObject holderGO = new GameObject(newPoolName);
//Transform holderTrans = holderGO.transform;
//holderTrans.SetParent(this.transform);
//poolHolders.Add(prefab, holderGO.transform);
//instancesCreated.Add(prefab, 0);
} }
protected virtual HS_Poolable CreatePoolable() protected virtual HS_Poolable CreatePoolable(HS_Poolable prefab)
{ {
HS_Poolable created = Instantiate(toCreateInstanceFrom); HS_Poolable created = Instantiate(prefab);
created.Prefab = toCreateInstanceFrom; // What with the weird Unity bug created.Prefab = prefab;
created.gameObject.SetActive(false); // Since the user may want to do stuff before letting it get enabled created.gameObject.SetActive(false);
Transform parent = poolHolders[toCreateInstanceFrom]; created.transform.SetParent(poolHolders[prefab], true);
created.transform.SetParent(parent, true);
instancesCreated[prefab]++;
// We need to identify and keep track of individual instances int id = instancesCreated[prefab];
instancesCreated[toCreateInstanceFrom]++;
int id = instancesCreated[toCreateInstanceFrom];
created.Init(id); created.Init(id);
created.name = $"{toCreateInstanceFrom.name}_{id}"; created.name = $"{prefab.name}_{id}";
created.ReadyToRejoinPool += OnReadyToRejoinPool; created.ReadyToRejoinPool += OnReadyToRejoinPool;
return created; return created;
} }
protected HS_Poolable toCreateInstanceFrom; protected virtual void OnReadyToRejoinPool(HS_Poolable instance)
protected IDictionary<HS_Poolable, Transform> poolHolders = new Dictionary<HS_Poolable, Transform>();
protected IDictionary<HS_Poolable, int> instancesCreated = new Dictionary<HS_Poolable, int>();
protected virtual void OnReadyToRejoinPool(HS_Poolable thatWillRejoin)
{ {
IObjectPool<HS_Poolable> whichToReturnTo = poolsPerPrefab[thatWillRejoin.Prefab]; ReturnToPool(instance);
whichToReturnTo.Release(thatWillRejoin);
} }
protected virtual void OnGetPoolableFromPool(HS_Poolable gotten) protected Dictionary<HS_Poolable, Queue<HS_Poolable>> poolsPerPrefab = new();
{ protected Dictionary<HS_Poolable, Transform> poolHolders = new();
// We don't activate the object here since the user might want to do stuff with it BEFORE protected Dictionary<HS_Poolable, int> instancesCreated = new();
// activating it.
// And yes, at the time of this writing, this func is empty on purpose.
}
protected virtual void OnReturnToPool(HS_Poolable returned)
{
Transform holder = poolHolders[returned.Prefab];
returned.transform.SetParent(holder, true);
}
protected virtual void OnPoolableDestroyed(HS_Poolable destroyed)
{
destroyed.ReadyToRejoinPool -= OnReadyToRejoinPool;
Destroy(destroyed.gameObject);
}
} }
} }

View File

@ -0,0 +1,139 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1767841913861676
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4156505390307840}
- component: {fileID: -3500030264155942338}
m_Layer: 0
m_Name: Hit_P_Anto_A
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4156505390307840
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1767841913861676}
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: 1709810513483797231}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &-3500030264155942338
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1767841913861676}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 456d2bd1c5c2e5e4b8b948836c4975a4, type: 3}
m_Name:
m_EditorClassIdentifier:
NoUseParticleTime: 1
OffTime: 1
e_EffectLocation: 0
--- !u!1001 &8459950807568485677
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 4156505390307840}
m_Modifications:
- target: {fileID: 1344600582501689884, guid: 8b42ce0268592094985529664d1d11ac,
type: 3}
propertyPath: m_Name
value: FX_Smoke_Hit
objectReference: {fileID: 0}
- target: {fileID: 7124061247494430658, guid: 8b42ce0268592094985529664d1d11ac,
type: 3}
propertyPath: m_LocalScale.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7124061247494430658, guid: 8b42ce0268592094985529664d1d11ac,
type: 3}
propertyPath: m_LocalScale.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7124061247494430658, guid: 8b42ce0268592094985529664d1d11ac,
type: 3}
propertyPath: m_LocalScale.z
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7124061247494430658, guid: 8b42ce0268592094985529664d1d11ac,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7124061247494430658, guid: 8b42ce0268592094985529664d1d11ac,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7124061247494430658, guid: 8b42ce0268592094985529664d1d11ac,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7124061247494430658, guid: 8b42ce0268592094985529664d1d11ac,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7124061247494430658, guid: 8b42ce0268592094985529664d1d11ac,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7124061247494430658, guid: 8b42ce0268592094985529664d1d11ac,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7124061247494430658, guid: 8b42ce0268592094985529664d1d11ac,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7124061247494430658, guid: 8b42ce0268592094985529664d1d11ac,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7124061247494430658, guid: 8b42ce0268592094985529664d1d11ac,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7124061247494430658, guid: 8b42ce0268592094985529664d1d11ac,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8b42ce0268592094985529664d1d11ac, type: 3}
--- !u!4 &1709810513483797231 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7124061247494430658, guid: 8b42ce0268592094985529664d1d11ac,
type: 3}
m_PrefabInstance: {fileID: 8459950807568485677}
m_PrefabAsset: {fileID: 0}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 1f18715184d7abd4e826685c062470b3
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -26,8 +26,8 @@ Transform:
m_GameObject: {fileID: 1767841913861676} m_GameObject: {fileID: 1767841913861676}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 6189279128195184115} - {fileID: 6189279128195184115}

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 26ae4b411b41fcd439edfac18b984afd
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 50621df8a112ed049a95fe0411e0005b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,175 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1767841913861676
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4156505390307840}
- component: {fileID: -3500030264155942338}
m_Layer: 0
m_Name: Hit_P_Planta_Kid
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4156505390307840
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1767841913861676}
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: 5556312799443772756}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &-3500030264155942338
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1767841913861676}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 456d2bd1c5c2e5e4b8b948836c4975a4, type: 3}
m_Name:
m_EditorClassIdentifier:
NoUseParticleTime: 1
OffTime: 1
e_EffectLocation: 0
--- !u!1001 &5551466587120412006
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 4156505390307840}
m_Modifications:
- target: {fileID: 1012929371636226, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3}
propertyPath: m_Name
value: Hit 1
objectReference: {fileID: 0}
- target: {fileID: 4847196408004658, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3}
propertyPath: m_LocalScale.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4847196408004658, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3}
propertyPath: m_LocalScale.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4847196408004658, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3}
propertyPath: m_LocalScale.z
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4847196408004658, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4847196408004658, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4847196408004658, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4847196408004658, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4847196408004658, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4847196408004658, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4847196408004658, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4847196408004658, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4847196408004658, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4847196408004658, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 199093406649196904, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 199499675225090684, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 199695001564087420, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 199699886376435688, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 199700334656404966, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 199839033946112236, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 199867125231304138, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 199892327733677744, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 199923374425794040, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 199983775170629824, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7e59152fc3be99d4aa2760fb61212ce2, type: 3}
--- !u!4 &5556312799443772756 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4847196408004658, guid: 7e59152fc3be99d4aa2760fb61212ce2,
type: 3}
m_PrefabInstance: {fileID: 5551466587120412006}
m_PrefabAsset: {fileID: 0}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: b833472195fc811459f57cabeec35502
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,278 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1767841913861676
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4156505390307840}
- component: {fileID: -3500030264155942338}
m_Layer: 0
m_Name: Hit_P_Platopo_A
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4156505390307840
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1767841913861676}
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: 6190882278035558046}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &-3500030264155942338
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1767841913861676}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 456d2bd1c5c2e5e4b8b948836c4975a4, type: 3}
m_Name:
m_EditorClassIdentifier:
NoUseParticleTime: 1
OffTime: 1
e_EffectLocation: 0
--- !u!1001 &6195616422155699368
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 4156505390307840}
m_Modifications:
- target: {fileID: 1576947433937734, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_Name
value: vfx_Hit_Comet_Orange
objectReference: {fileID: 0}
- target: {fileID: 4108447487532464, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalScale.x
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 4108447487532464, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalScale.y
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 4108447487532464, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalScale.z
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 4572902407090838, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalScale.x
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 4572902407090838, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalScale.y
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 4572902407090838, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalScale.z
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 4593457865632866, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalScale.x
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 4593457865632866, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalScale.y
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 4593457865632866, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalScale.z
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 4678465994255454, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalScale.x
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 4678465994255454, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalScale.y
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 4678465994255454, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalScale.z
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 4772148755318368, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalScale.x
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 4772148755318368, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalScale.y
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 4772148755318368, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalScale.z
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 4795275528761654, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalScale.x
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 4795275528761654, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalScale.y
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 4795275528761654, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalScale.z
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 4836678430149174, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4836678430149174, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4836678430149174, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4836678430149174, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4836678430149174, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4836678430149174, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4836678430149174, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4836678430149174, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4836678430149174, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4836678430149174, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4836678430149174, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4836678430149174, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4836678430149174, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4846958843365554, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalScale.x
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 4846958843365554, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalScale.y
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 4846958843365554, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalScale.z
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 4878530528333072, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalScale.x
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 4878530528333072, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalScale.y
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 4878530528333072, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalScale.z
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 4910591832770296, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalScale.x
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 4910591832770296, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalScale.y
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 4910591832770296, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
propertyPath: m_LocalScale.z
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 199070626948702256, guid: 3a1ab18e6861a8940aa332e72f024271,
type: 3}
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 199167496618258960, guid: 3a1ab18e6861a8940aa332e72f024271,
type: 3}
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 199393799236893744, guid: 3a1ab18e6861a8940aa332e72f024271,
type: 3}
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 199436555297516748, guid: 3a1ab18e6861a8940aa332e72f024271,
type: 3}
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 199535606522666056, guid: 3a1ab18e6861a8940aa332e72f024271,
type: 3}
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 199666213390642086, guid: 3a1ab18e6861a8940aa332e72f024271,
type: 3}
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 199687912870357576, guid: 3a1ab18e6861a8940aa332e72f024271,
type: 3}
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 199716370951615188, guid: 3a1ab18e6861a8940aa332e72f024271,
type: 3}
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 199852746430165052, guid: 3a1ab18e6861a8940aa332e72f024271,
type: 3}
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3a1ab18e6861a8940aa332e72f024271, type: 3}
--- !u!4 &6190882278035558046 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4836678430149174, guid: 3a1ab18e6861a8940aa332e72f024271,
type: 3}
m_PrefabInstance: {fileID: 6195616422155699368}
m_PrefabAsset: {fileID: 0}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0abebc6465c278e4c8a6cc1680aa1734
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -26,8 +26,8 @@ Transform:
m_GameObject: {fileID: 1767841913861676} m_GameObject: {fileID: 1767841913861676}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 5459216805780114818} - {fileID: 5459216805780114818}

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c002e69eaf7fe5342b5692aa86a9cfbb
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,140 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1767841913861676
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4156505390307840}
- component: {fileID: -3500030264155942338}
m_Layer: 0
m_Name: Hit_P_Snailo_C
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4156505390307840
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1767841913861676}
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: 2111144732620942909}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &-3500030264155942338
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1767841913861676}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 456d2bd1c5c2e5e4b8b948836c4975a4, type: 3}
m_Name:
m_EditorClassIdentifier:
NoUseParticleTime: 1
OffTime: 1
e_EffectLocation: 0
--- !u!1001 &2116063238588260895
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 4156505390307840}
m_Modifications:
- target: {fileID: 1862546671279240, guid: c7652840ac054dd428fadb028b9d2cf9, type: 3}
propertyPath: m_Name
value: vfx_Hit_PinkGum
objectReference: {fileID: 0}
- target: {fileID: 4942026317368354, guid: c7652840ac054dd428fadb028b9d2cf9, type: 3}
propertyPath: m_LocalScale.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4942026317368354, guid: c7652840ac054dd428fadb028b9d2cf9, type: 3}
propertyPath: m_LocalScale.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4942026317368354, guid: c7652840ac054dd428fadb028b9d2cf9, type: 3}
propertyPath: m_LocalScale.z
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4942026317368354, guid: c7652840ac054dd428fadb028b9d2cf9, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4942026317368354, guid: c7652840ac054dd428fadb028b9d2cf9, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4942026317368354, guid: c7652840ac054dd428fadb028b9d2cf9, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4942026317368354, guid: c7652840ac054dd428fadb028b9d2cf9, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4942026317368354, guid: c7652840ac054dd428fadb028b9d2cf9, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4942026317368354, guid: c7652840ac054dd428fadb028b9d2cf9, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4942026317368354, guid: c7652840ac054dd428fadb028b9d2cf9, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4942026317368354, guid: c7652840ac054dd428fadb028b9d2cf9, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4942026317368354, guid: c7652840ac054dd428fadb028b9d2cf9, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4942026317368354, guid: c7652840ac054dd428fadb028b9d2cf9, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 132612829085046407, guid: c7652840ac054dd428fadb028b9d2cf9,
type: 3}
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 199461367965961796, guid: c7652840ac054dd428fadb028b9d2cf9,
type: 3}
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 199477424967963612, guid: c7652840ac054dd428fadb028b9d2cf9,
type: 3}
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c7652840ac054dd428fadb028b9d2cf9, type: 3}
--- !u!4 &2111144732620942909 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4942026317368354, guid: c7652840ac054dd428fadb028b9d2cf9,
type: 3}
m_PrefabInstance: {fileID: 2116063238588260895}
m_PrefabAsset: {fileID: 0}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 93da3f45eeafd7141a9b6df0cb490fac
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -130,9 +130,9 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
ColliderLayer: Actor ColliderLayer: Actor
m_Pierce: 0 m_Pierce: 1
str_HitEffect: str_HitEffect: Pet/Hit_P_Anto_A
m_ShowTimeOverEffect: 1 m_ShowTimeOverEffect: 0
ShowTarget: 1 ShowTarget: 1
--- !u!65 &6782093134866277011 --- !u!65 &6782093134866277011
BoxCollider: BoxCollider:

View File

@ -130,9 +130,10 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
ColliderLayer: Actor ColliderLayer: Actor
m_Pierce: 0 m_Pierce: 1
str_HitEffect: str_HitEffect:
m_ShowTimeOverEffect: 1 m_ShowTimeOverEffect: 0
ShowTarget: 1
--- !u!65 &6782093134866277011 --- !u!65 &6782093134866277011
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -130,9 +130,10 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
ColliderLayer: Actor ColliderLayer: Actor
m_Pierce: 0 m_Pierce: 1
str_HitEffect: str_HitEffect:
m_ShowTimeOverEffect: 1 m_ShowTimeOverEffect: 0
ShowTarget: 1
--- !u!65 &6782093134866277011 --- !u!65 &6782093134866277011
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -1,88 +1,5 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1 &359492963229537179
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3212436743952790601}
- component: {fileID: 2864512912963179641}
- component: {fileID: 5611405915983910845}
m_Layer: 0
m_Name: Cube
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &3212436743952790601
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 359492963229537179}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 3, y: 3, z: 3}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 223961062764596305}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &2864512912963179641
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 359492963229537179}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &5611405915983910845
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 359492963229537179}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &907428178798376589 --- !u!1 &907428178798376589
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -113,8 +30,7 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children: []
- {fileID: 3212436743952790601}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6311613290837446200 --- !u!114 &6311613290837446200
@ -130,9 +46,10 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
ColliderLayer: Actor ColliderLayer: Actor
m_Pierce: 0 m_Pierce: 1
str_HitEffect: str_HitEffect: Pet/Hit_P_Cute_Spider_A
m_ShowTimeOverEffect: 1 m_ShowTimeOverEffect: 0
ShowTarget: 1
--- !u!65 &6782093134866277011 --- !u!65 &6782093134866277011
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -130,9 +130,10 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
ColliderLayer: Actor ColliderLayer: Actor
m_Pierce: 0 m_Pierce: 1
str_HitEffect: str_HitEffect:
m_ShowTimeOverEffect: 1 m_ShowTimeOverEffect: 0
ShowTarget: 1
--- !u!65 &6782093134866277011 --- !u!65 &6782093134866277011
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -1,88 +1,5 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1 &359492963229537179
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3212436743952790601}
- component: {fileID: 2864512912963179641}
- component: {fileID: 5611405915983910845}
m_Layer: 0
m_Name: Cube
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &3212436743952790601
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 359492963229537179}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 3, y: 3, z: 3}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 223961062764596305}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &2864512912963179641
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 359492963229537179}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &5611405915983910845
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 359492963229537179}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &907428178798376589 --- !u!1 &907428178798376589
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -113,8 +30,7 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children: []
- {fileID: 3212436743952790601}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6311613290837446200 --- !u!114 &6311613290837446200
@ -130,9 +46,10 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
ColliderLayer: Actor ColliderLayer: Actor
m_Pierce: 0 m_Pierce: 1
str_HitEffect: str_HitEffect: Pet/Hit_P_Fire_Pig_A
m_ShowTimeOverEffect: 1 m_ShowTimeOverEffect: 0
ShowTarget: 1
--- !u!65 &6782093134866277011 --- !u!65 &6782093134866277011
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -130,9 +130,10 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
ColliderLayer: Actor ColliderLayer: Actor
m_Pierce: 0 m_Pierce: 1
str_HitEffect: str_HitEffect:
m_ShowTimeOverEffect: 1 m_ShowTimeOverEffect: 0
ShowTarget: 1
--- !u!65 &6782093134866277011 --- !u!65 &6782093134866277011
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -130,9 +130,10 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
ColliderLayer: Actor ColliderLayer: Actor
m_Pierce: 0 m_Pierce: 1
str_HitEffect: str_HitEffect:
m_ShowTimeOverEffect: 1 m_ShowTimeOverEffect: 0
ShowTarget: 1
--- !u!65 &6782093134866277011 --- !u!65 &6782093134866277011
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -130,9 +130,10 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
ColliderLayer: Actor ColliderLayer: Actor
m_Pierce: 0 m_Pierce: 1
str_HitEffect: str_HitEffect:
m_ShowTimeOverEffect: 1 m_ShowTimeOverEffect: 0
ShowTarget: 1
--- !u!65 &6782093134866277011 --- !u!65 &6782093134866277011
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

File diff suppressed because it is too large Load Diff

View File

@ -1,88 +1,5 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1 &359492963229537179
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3212436743952790601}
- component: {fileID: 2864512912963179641}
- component: {fileID: 5611405915983910845}
m_Layer: 0
m_Name: Cube
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &3212436743952790601
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 359492963229537179}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 3, y: 3, z: 3}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 223961062764596305}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &2864512912963179641
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 359492963229537179}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &5611405915983910845
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 359492963229537179}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &907428178798376589 --- !u!1 &907428178798376589
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -113,8 +30,7 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children: []
- {fileID: 3212436743952790601}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6311613290837446200 --- !u!114 &6311613290837446200
@ -130,9 +46,10 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
ColliderLayer: Actor ColliderLayer: Actor
m_Pierce: 0 m_Pierce: 1
str_HitEffect: str_HitEffect: Pet/Hit_P_Planta_Kid
m_ShowTimeOverEffect: 1 m_ShowTimeOverEffect: 0
ShowTarget: 1
--- !u!65 &6782093134866277011 --- !u!65 &6782093134866277011
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -1,88 +1,5 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1 &359492963229537179
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3212436743952790601}
- component: {fileID: 2864512912963179641}
- component: {fileID: 5611405915983910845}
m_Layer: 0
m_Name: Cube
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &3212436743952790601
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 359492963229537179}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 3, y: 3, z: 3}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 223961062764596305}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &2864512912963179641
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 359492963229537179}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &5611405915983910845
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 359492963229537179}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &907428178798376589 --- !u!1 &907428178798376589
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -113,8 +30,7 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children: []
- {fileID: 3212436743952790601}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6311613290837446200 --- !u!114 &6311613290837446200
@ -130,9 +46,10 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
ColliderLayer: Actor ColliderLayer: Actor
m_Pierce: 0 m_Pierce: 1
str_HitEffect: str_HitEffect: Pet/Hit_P_Platopo_A
m_ShowTimeOverEffect: 1 m_ShowTimeOverEffect: 0
ShowTarget: 1
--- !u!65 &6782093134866277011 --- !u!65 &6782093134866277011
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -46,9 +46,9 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
ColliderLayer: Actor ColliderLayer: Actor
m_Pierce: 0 m_Pierce: 1
str_HitEffect: Pet/Hit_P_Podol_D str_HitEffect: Pet/Hit_P_Podol_D
m_ShowTimeOverEffect: 1 m_ShowTimeOverEffect: 0
ShowTarget: 1 ShowTarget: 1
--- !u!65 &6782093134866277011 --- !u!65 &6782093134866277011
BoxCollider: BoxCollider:

View File

@ -56,6 +56,7 @@ MonoBehaviour:
str_HitEffect: FireBoltHit str_HitEffect: FireBoltHit
m_ShowTimeOverEffect: 1 m_ShowTimeOverEffect: 1
m_Direction: 0 m_Direction: 0
m_Speed: 0
--- !u!198 &198365587299786030 --- !u!198 &198365587299786030
ParticleSystem: ParticleSystem:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -130,9 +130,10 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
ColliderLayer: Actor ColliderLayer: Actor
m_Pierce: 0 m_Pierce: 1
str_HitEffect: str_HitEffect:
m_ShowTimeOverEffect: 1 m_ShowTimeOverEffect: 0
ShowTarget: 1
--- !u!65 &6782093134866277011 --- !u!65 &6782093134866277011
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -130,9 +130,10 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
ColliderLayer: Actor ColliderLayer: Actor
m_Pierce: 0 m_Pierce: 1
str_HitEffect: str_HitEffect:
m_ShowTimeOverEffect: 1 m_ShowTimeOverEffect: 0
ShowTarget: 1
--- !u!65 &6782093134866277011 --- !u!65 &6782093134866277011
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -130,9 +130,10 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
ColliderLayer: Actor ColliderLayer: Actor
m_Pierce: 0 m_Pierce: 1
str_HitEffect: str_HitEffect:
m_ShowTimeOverEffect: 1 m_ShowTimeOverEffect: 0
ShowTarget: 1
--- !u!65 &6782093134866277011 --- !u!65 &6782093134866277011
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -1,88 +1,5 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1 &359492963229537179
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3212436743952790601}
- component: {fileID: 2864512912963179641}
- component: {fileID: 5611405915983910845}
m_Layer: 0
m_Name: Cube
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &3212436743952790601
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 359492963229537179}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 3, y: 3, z: 3}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 223961062764596305}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &2864512912963179641
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 359492963229537179}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &5611405915983910845
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 359492963229537179}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &907428178798376589 --- !u!1 &907428178798376589
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -113,8 +30,7 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children: []
- {fileID: 3212436743952790601}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6311613290837446200 --- !u!114 &6311613290837446200
@ -130,9 +46,10 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
ColliderLayer: Actor ColliderLayer: Actor
m_Pierce: 0 m_Pierce: 1
str_HitEffect: str_HitEffect: Pet/Hit_P_Scopionto_A
m_ShowTimeOverEffect: 1 m_ShowTimeOverEffect: 0
ShowTarget: 1
--- !u!65 &6782093134866277011 --- !u!65 &6782093134866277011
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: ea25f7ba0f178d04d8f13b3c5aa2243f guid: 18a44f4ba88d9d2429b0bbce31304c92
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 100100000 mainObjectFileID: 100100000

View File

@ -85,10 +85,15 @@ public class PetUI_Left : UI3DModel
itemlst.Add(temp); itemlst.Add(temp);
sdata.Add_Item(temp.itemid, 1); sdata.Add_Item(temp.itemid, 1);
} }
ObtainItemUI.Ins.Set(itemlst);
sdata.Add_MissionCount(ePurpose.GACHA_PET, 0, amount); sdata.Add_MissionCount(ePurpose.GACHA_PET, 0, amount);
sdata.Add_MissionCount(ePurpose.GACHA_PET_ACC, 0, amount); sdata.Add_MissionCount(ePurpose.GACHA_PET_ACC, 0, amount);
sdata.Add_MissionCount(ePurpose.GACHA_ALL, 0, amount); sdata.Add_MissionCount(ePurpose.GACHA_ALL, 0, amount);
ServerInfo.Ins.Write(() =>
{
ObtainItemUI.Ins.Set(itemlst);
NewGameUI.Ins.m_PetUI.m_PetUI_Right.Set_Scroll();
});
} }
} }

View File

@ -13,11 +13,13 @@ public class PetUI_Right : uScrollViewMgr
public override void Set() public override void Set()
{ {
Set_ScrollView(table_petlist.Ins.Get_DataList()); Set_Scroll();
SelectPet(null); SelectPet(null);
Set_UI(); Set_UI();
} }
public void Set_Scroll() { Set_ScrollView(table_petlist.Ins.Get_DataList()); }
public override void Set_UI() public override void Set_UI()
{ {
var sdata = ServerInfo.Ins.m_ServerData; var sdata = ServerInfo.Ins.m_ServerData;