골렘 완료

This commit is contained in:
Ino 2024-12-16 15:28:42 +09:00
parent a956122732
commit e74162aac7
14 changed files with 75 additions and 4306 deletions

View File

@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: a14259c7aea7b0047922da833fe080c4
ModelImporter:
serializedVersion: 20200
serializedVersion: 22200
internalIDToNameTable:
- first:
74: 1905944193896961103
@ -17,6 +17,7 @@ ModelImporter:
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
@ -58,7 +59,14 @@ ModelImporter:
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
events:
- time: 0.6724511
functionName: Projectile
data: MeleeAttack
objectReferenceParameter: {instanceID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
transformMask: []
maskType: 3
maskSource: {instanceID: 0}
@ -71,10 +79,12 @@ ModelImporter:
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 0
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
@ -86,6 +96,7 @@ ModelImporter:
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
@ -96,6 +107,7 @@ ModelImporter:
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
@ -128,6 +140,8 @@ ModelImporter:
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 0
remapMaterialsIfMaterialImportModeIsNone: 1
additionalBone: 0
userData:
assetBundleName:

View File

@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: 05ac25d8fa5794f4db21ba46130d25dc
ModelImporter:
serializedVersion: 20200
serializedVersion: 22200
internalIDToNameTable:
- first:
74: -4165463316885468178
@ -17,6 +17,7 @@ ModelImporter:
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
@ -58,7 +59,14 @@ ModelImporter:
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
events:
- time: 0
functionName: Event_Idle
data:
objectReferenceParameter: {instanceID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
transformMask: []
maskType: 3
maskSource: {instanceID: 0}
@ -71,10 +79,12 @@ ModelImporter:
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 0
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
@ -86,6 +96,7 @@ ModelImporter:
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
@ -96,6 +107,7 @@ ModelImporter:
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
@ -128,6 +140,8 @@ ModelImporter:
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 0
remapMaterialsIfMaterialImportModeIsNone: 1
additionalBone: 0
userData:
assetBundleName:

File diff suppressed because one or more lines are too long

View File

@ -8,15 +8,16 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Circle8cg
m_Shader: {fileID: -6465566751694194690, guid: 00191177e5fd5c4468ad546ce87ef329, type: 3}
m_Shader: {fileID: -6465566751694194690, guid: 00191177e5fd5c4468ad546ce87ef329,
type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _BUILTIN_SURFACE_TYPE_TRANSPARENT
- _ENABLE_FOG_ON_TRANSPARENT
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords:
- _DOUBLESIDED_ON
- _ENABLE_FOG_ON_TRANSPARENT
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 1
@ -29,6 +30,8 @@ Material:
- TransparentDepthPostpass
- TransparentBackface
- MOTIONVECTORS
- DepthOnly
- SHADOWCASTER
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
@ -148,7 +151,7 @@ Material:
- _Opacity: 1
- _OpaqueCullMode: 2
- _Parallax: 0.02
- _QueueControl: -1
- _QueueControl: 0
- _QueueOffset: 0
- _RenderQueueType: 3
- _SmoothnessTextureChannel: 0

View File

@ -24,15 +24,16 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Crater18cg
m_Shader: {fileID: -6465566751694194690, guid: 00191177e5fd5c4468ad546ce87ef329, type: 3}
m_Shader: {fileID: -6465566751694194690, guid: 00191177e5fd5c4468ad546ce87ef329,
type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _BUILTIN_SURFACE_TYPE_TRANSPARENT
- _ENABLE_FOG_ON_TRANSPARENT
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords:
- _DOUBLESIDED_ON
- _ENABLE_FOG_ON_TRANSPARENT
- _USECENTERGLOW_ON
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
@ -46,6 +47,8 @@ Material:
- TransparentDepthPostpass
- TransparentBackface
- MOTIONVECTORS
- DepthOnly
- SHADOWCASTER
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
@ -163,7 +166,7 @@ Material:
- _Opacity: 1
- _OpaqueCullMode: 2
- _Parallax: 0.02
- _QueueControl: -1
- _QueueControl: 0
- _QueueOffset: 0
- _RenderQueueType: 3
- _SmoothnessTextureChannel: 0

View File

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

View File

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

View File

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

View File

@ -10,14 +10,6 @@ GameObject:
m_Component:
- component: {fileID: 5554110293025473612}
- component: {fileID: 260241843548170776}
- component: {fileID: -3050385333415133725}
- component: {fileID: -1313318992120991163}
- component: {fileID: 1557407064129548233}
- component: {fileID: 935056102100102435}
- component: {fileID: -2704172344568912250}
- component: {fileID: 4650134076787207380}
- component: {fileID: -162674785610032198}
- component: {fileID: -5620277360307990653}
m_Layer: 5
m_Name: HUDUI
m_TagString: Untagged
@ -61,102 +53,6 @@ MonoBehaviour:
HPSlider: {fileID: 2422730580727654154}
TimeSlider: {fileID: 1401177050656101182}
go_BossIcon: {fileID: 3646265410563732949}
--- !u!114 &-3050385333415133725
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 900580927744001116}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d79b1199ae5ec3a43aceed41e45d57aa, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &-1313318992120991163
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 900580927744001116}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d79b1199ae5ec3a43aceed41e45d57aa, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1557407064129548233
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 900580927744001116}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d79b1199ae5ec3a43aceed41e45d57aa, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &935056102100102435
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 900580927744001116}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d79b1199ae5ec3a43aceed41e45d57aa, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &-2704172344568912250
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 900580927744001116}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d79b1199ae5ec3a43aceed41e45d57aa, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &4650134076787207380
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 900580927744001116}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d79b1199ae5ec3a43aceed41e45d57aa, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &-162674785610032198
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 900580927744001116}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d79b1199ae5ec3a43aceed41e45d57aa, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &-5620277360307990653
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 900580927744001116}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d79b1199ae5ec3a43aceed41e45d57aa, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1398033801509395043
GameObject:
m_ObjectHideFlags: 0

View File

@ -24,13 +24,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8647284975445772971}
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: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2407830416254564331
MonoBehaviour:
@ -44,3 +44,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fb0f492046c54da4782198e9f08127bc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Pierce: 0
str_HitEffect:
prefab: Mega_Golem_A
lifeTime: 30

File diff suppressed because it is too large Load Diff

View File

@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: 0f9c89bd797316e40a380da3b1a867c8
timeCreated: 1492599639
licenseType: Store
NativeFormatImporter:
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -170,7 +170,7 @@ GameObject:
- component: {fileID: 7012071424662290949}
m_Layer: 0
m_Name: Hourglass A
m_TagString: Untagged
m_TagString: Summon
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0

View File

@ -30,10 +30,10 @@ public class SummonActor : MyActor
m_Stat.Set_Stat(true, eStat.BaseDmg, m_Stat.Get_Stat(eStat.BaseDmg) * _attackrate);
m_Stat.Set_Stat(true, eStat.HP, m_Stat.Get_Stat(eStat.HP) * _hprate);
m_NavMeshAgent.speed = owner.Get_MoveSpeed();
m_NavStopDistance = f_FindEnemyRange = SummonType == eSummon.Golem ? 4.5f : 7f;
m_NavStopDistance = f_FindEnemyRange = SummonType == eSummon.Golem ? 1.5f : 3.5f;
Set_Warp(owner.Get_position() + Vector3.forward);
InGameInfo.Ins.Show_Effect("Effect_Summoning", transform.position);
InGameInfo.Ins.Show_Effect(SummonType == eSummon.Golem ? "Effect_Summoning_Golem" : "Effect_Summoning", transform.position);
Set(isEnemy, owner, owner.Get_ServerData(), 0, true);
Set_Coroutine(() =>
@ -78,6 +78,6 @@ public class SummonActor : MyActor
{
base.After_Die();
Off();
InGameInfo.Ins.Show_Effect("Effect_Summoning", transform.position);
InGameInfo.Ins.Show_Effect(SummonType == eSummon.Golem ? "Effect_Summoning_Golem" : "Effect_Summoning", transform.position);
}
}