skull shaman a

2025-02-10 11:56:16 +09:00 · 2025-02-10 11:56:16 +09:00 · ab5750655c
parent ca73946b07
commit ab5750655c
22 changed files with 492 additions and 59 deletions
--- a/2/Animations/Skull_Shaman/Anim_Skull_Shaman@Attack.fbx.meta
+++ b/2/Animations/Skull_Shaman/Anim_Skull_Shaman@Attack.fbx.meta
@ -1,7 +1,7 @@
 fileFormatVersion: 2
 guid: 16476817968070344ac4b4e29eb23a9c
 ModelImporter:
-  serializedVersion: 20300
+  serializedVersion: 22200
  internalIDToNameTable: []
  externalObjects: {}
  materials:
@ -14,6 +14,7 @@ ModelImporter:
    bakeSimulation: 0
    resampleCurves: 1
    optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
    motionNodeName: 
    rigImportErrors: 
    rigImportWarnings: 
@ -55,7 +56,14 @@ ModelImporter:
      mirror: 0
      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
      curves: []
-      events: []
+      events:
+      - time: 0.21601938
+        functionName: Projectile
+        data: 
+        objectReferenceParameter: {instanceID: 0}
+        floatParameter: 0
+        intParameter: 0
+        messageOptions: 0
      transformMask: []
      maskType: 3
      maskSource: {instanceID: 0}
@ -68,10 +76,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
@ -83,6 +93,7 @@ ModelImporter:
    skinWeightsMode: 0
    maxBonesPerVertex: 4
    minBoneWeight: 0.001
+    optimizeBones: 1
    meshOptimizationFlags: -1
    indexFormat: 0
    secondaryUVAngleDistortion: 8
@ -93,6 +104,7 @@ ModelImporter:
    secondaryUVMinObjectScale: 1
    secondaryUVPackMargin: 4
    useFileScale: 1
+    strictVertexDataChecks: 0
  tangentSpace:
    normalSmoothAngle: 60
    normalImportMode: 0
@ -125,6 +137,7 @@ ModelImporter:
  humanoidOversampling: 1
  avatarSetup: 0
  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  importBlendShapeDeformPercent: 0
  remapMaterialsIfMaterialImportModeIsNone: 0
  additionalBone: 0
  userData: 
--- a/Assets/ResWork/Table/Export/MonsterAppear.json
+++ b/Assets/ResWork/Table/Export/MonsterAppear.json
--- a/Assets/ResWork/Table/Export/MonsterList.json
+++ b/Assets/ResWork/Table/Export/MonsterList.json
--- a/Assets/ResWork/Table/Export/SkillList.json
+++ b/Assets/ResWork/Table/Export/SkillList.json
--- a/Assets/ResWork/Table/butler.xlsm
+++ b/Assets/ResWork/Table/butler.xlsm
--- a/Assets/Res_Addr/Map/Map_C01.prefab
+++ b/Assets/Res_Addr/Map/Map_C01.prefab
@ -16,7 +16,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &3595581076324338189
 Transform:
  m_ObjectHideFlags: 0
@ -287,7 +287,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &1460078733060589353
 Transform:
  m_ObjectHideFlags: 0
@ -507,7 +507,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &6662552769912589700
 Transform:
  m_ObjectHideFlags: 0
@ -727,7 +727,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &3622314252338425971
 Transform:
  m_ObjectHideFlags: 0
@ -775,7 +775,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &6105624329720116255
 Transform:
  m_ObjectHideFlags: 0
@ -823,7 +823,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &6741524882457970978
 Transform:
  m_ObjectHideFlags: 0
@ -871,7 +871,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &6759904947619752500
 Transform:
  m_ObjectHideFlags: 0
@ -1435,7 +1435,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &7542380909958508854
 Transform:
  m_ObjectHideFlags: 0
@ -1483,7 +1483,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &6769070107967770152
 Transform:
  m_ObjectHideFlags: 0
@ -1837,7 +1837,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &2270204867744192306
 Transform:
  m_ObjectHideFlags: 0
@ -2041,6 +2041,178 @@ MonoBehaviour:
  m_hasFontAssetChanged: 0
  m_renderer: {fileID: 6000738177825341772}
  m_maskType: 0
+--- !u!1 &1952904571168200608
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5910252182608519374}
+  - component: {fileID: 2227239770899230767}
+  - component: {fileID: 1663648852416395309}
+  m_Layer: 3
+  m_Name: lv
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 119
+  m_IsActive: 1
+--- !u!224 &5910252182608519374
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1952904571168200608}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: -0.7071068, w: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 3.14}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8543470032144370301}
+  m_LocalEulerAnglesHint: {x: 90, y: 180, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 20, y: 5}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!23 &2227239770899230767
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1952904571168200608}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  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: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2}
+  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!114 &1663648852416395309
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1952904571168200608}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: Lv.1
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2}
+  m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57,
+    type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 36
+  m_fontSizeBase: 36
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 4096
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 0
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  _SortingLayer: 0
+  _SortingLayerID: 0
+  _SortingOrder: 0
+  m_hasFontAssetChanged: 0
+  m_renderer: {fileID: 2227239770899230767}
+  m_maskType: 0
 --- !u!1 &1972303947988998117
 GameObject:
  m_ObjectHideFlags: 0
@ -2229,7 +2401,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &7991409398145374568
 Transform:
  m_ObjectHideFlags: 0
@ -2323,7 +2495,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &8188736168311835135
 Transform:
  m_ObjectHideFlags: 0
@ -2545,7 +2717,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &5953320463777954900
 Transform:
  m_ObjectHideFlags: 0
@ -2937,7 +3109,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &8816706937435477098
 Transform:
  m_ObjectHideFlags: 0
@ -2985,7 +3157,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &6595820985237762726
 Transform:
  m_ObjectHideFlags: 0
@ -3849,7 +4021,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &7690437723635111431
 Transform:
  m_ObjectHideFlags: 0
@ -4069,7 +4241,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &903422559103179026
 Transform:
  m_ObjectHideFlags: 0
@ -4117,7 +4289,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &6230257042294131079
 Transform:
  m_ObjectHideFlags: 0
@ -4197,7 +4369,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &178087978965653919
 Transform:
  m_ObjectHideFlags: 0
@ -4417,7 +4589,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &930287813562031024
 Transform:
  m_ObjectHideFlags: 0
@ -4755,7 +4927,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &8486286749940756884
 Transform:
  m_ObjectHideFlags: 0
@ -4803,7 +4975,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &3448854700971622365
 Transform:
  m_ObjectHideFlags: 0
@ -4851,7 +5023,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &4387972420525540532
 Transform:
  m_ObjectHideFlags: 0
@ -4899,7 +5071,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &9179723709626358036
 Transform:
  m_ObjectHideFlags: 0
@ -5291,7 +5463,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &2133665355399497899
 Transform:
  m_ObjectHideFlags: 0
@ -5339,7 +5511,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &5603627405202849380
 Transform:
  m_ObjectHideFlags: 0
@ -5766,7 +5938,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &1800314298402158556
 Transform:
  m_ObjectHideFlags: 0
@ -6158,7 +6330,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &5440308938690729503
 Transform:
  m_ObjectHideFlags: 0
@ -6550,7 +6722,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &7932281096857609278
 Transform:
  m_ObjectHideFlags: 0
@ -6975,7 +7147,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &6341715078015624793
 Transform:
  m_ObjectHideFlags: 0
@ -7023,7 +7195,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &173547967928100347
 Transform:
  m_ObjectHideFlags: 0
@ -7055,6 +7227,54 @@ MonoBehaviour:
  SpawnerID: 27
  MobGenRange: 10
  text_lv: {fileID: 3223591928036160104}
+--- !u!1 &5557118036565271179
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8543470032144370301}
+  - component: {fileID: 2614160777379959961}
+  m_Layer: 3
+  m_Name: 46
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 2147483647
+  m_IsActive: 1
+--- !u!4 &8543470032144370301
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5557118036565271179}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 311.3, y: 0.01, z: 292.7}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 5910252182608519374}
+  m_Father: {fileID: 7786833865820079638}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2614160777379959961
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5557118036565271179}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 06269e6c1653db34090895cd16244df9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  SpawnerID: 46
+  MobGenRange: 10
+  text_lv: {fileID: 1663648852416395309}
 --- !u!1 &5590050816150053502
 GameObject:
  m_ObjectHideFlags: 0
@ -7071,7 +7291,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &5888248550636579611
 Transform:
  m_ObjectHideFlags: 0
@ -7119,7 +7339,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &9149960666256926434
 Transform:
  m_ObjectHideFlags: 0
@ -73265,6 +73485,7 @@ Transform:
  - {fileID: 2133665355399497899}
  - {fileID: 7932281096857609278}
  - {fileID: 9093238090581048015}
+  - {fileID: 8543470032144370301}
  m_Father: {fileID: 6738690448854471834}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &8973930304619307241
@ -73867,7 +74088,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &6637219844519276261
 Transform:
  m_ObjectHideFlags: 0
@ -73915,7 +74136,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &4875175055515932105
 Transform:
  m_ObjectHideFlags: 0
@ -74135,7 +74356,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &2345167900952430901
 Transform:
  m_ObjectHideFlags: 0
@ -74183,7 +74404,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &8802925289514687336
 Transform:
  m_ObjectHideFlags: 0
@ -74231,7 +74452,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &9093238090581048015
 Transform:
  m_ObjectHideFlags: 0
@ -74451,7 +74672,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &5906645087368143314
 Transform:
  m_ObjectHideFlags: 0
@ -74499,7 +74720,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &4910813047548304301
 Transform:
  m_ObjectHideFlags: 0
@ -74623,7 +74844,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &1527004815598546921
 Transform:
  m_ObjectHideFlags: 0
@ -75015,7 +75236,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &629456795994766570
 Transform:
  m_ObjectHideFlags: 0
@ -75063,7 +75284,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &3978641278881286400
 Transform:
  m_ObjectHideFlags: 0
@ -75971,7 +76192,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &2359441709723662662
 Transform:
  m_ObjectHideFlags: 0
@ -76363,7 +76584,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &4201117426651649268
 Transform:
  m_ObjectHideFlags: 0
@ -77786,7 +78007,7 @@ PrefabInstance:
    - target: {fileID: 960630095900046633, guid: 73c6a05b987c3214f9d0c6ae8a803da6,
        type: 3}
      propertyPath: m_LocalPosition.x
-      value: 284.2
+      value: 297.5
      objectReference: {fileID: 0}
    - target: {fileID: 960630095900046633, guid: 73c6a05b987c3214f9d0c6ae8a803da6,
        type: 3}
@ -77796,7 +78017,7 @@ PrefabInstance:
    - target: {fileID: 960630095900046633, guid: 73c6a05b987c3214f9d0c6ae8a803da6,
        type: 3}
      propertyPath: m_LocalPosition.z
-      value: 233.8
+      value: 271.5
      objectReference: {fileID: 0}
    - target: {fileID: 960630095900046633, guid: 73c6a05b987c3214f9d0c6ae8a803da6,
        type: 3}
--- a/Assets/Res_Addr/Mobs/Elite.meta
+++ b/Assets/Res_Addr/Mobs/Elite.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b8ebef6ec028f024e913bd4a2b222ae8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Res_Addr/Mobs/Elite/Skull_Shaman_A.prefab
+++ b/Assets/Res_Addr/Mobs/Elite/Skull_Shaman_A.prefab
@ -116,7 +116,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  gos_Effect: []
  m_Role: 0
-  m_SubRole: 0
+  m_SubRole: 1
  m_AttackType: 0
  m_animation: {fileID: 0}
  _target: {fileID: 0}
--- a/Assets/Res_Addr/Mobs/Elite/Skull_Shaman_A.prefab.meta
+++ b/Assets/Res_Addr/Mobs/Elite/Skull_Shaman_A.prefab.meta
--- a/Assets/Res_Addr/Mobs/Elite/Skull_Shaman_B.prefab
+++ b/Assets/Res_Addr/Mobs/Elite/Skull_Shaman_B.prefab
@ -329,7 +329,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  gos_Effect: []
  m_Role: 0
-  m_SubRole: 0
+  m_SubRole: 1
  m_AttackType: 0
  m_animation: {fileID: 0}
  _target: {fileID: 0}
--- a/Assets/Res_Addr/Mobs/Elite/Skull_Shaman_B.prefab.meta
+++ b/Assets/Res_Addr/Mobs/Elite/Skull_Shaman_B.prefab.meta
--- a/Assets/Res_Addr/Mobs/Elite/Skull_Shaman_C.prefab
+++ b/Assets/Res_Addr/Mobs/Elite/Skull_Shaman_C.prefab
@ -490,7 +490,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  gos_Effect: []
  m_Role: 0
-  m_SubRole: 0
+  m_SubRole: 1
  m_AttackType: 0
  m_animation: {fileID: 0}
  _target: {fileID: 0}
--- a/Assets/Res_Addr/Mobs/Elite/Skull_Shaman_C.prefab.meta
+++ b/Assets/Res_Addr/Mobs/Elite/Skull_Shaman_C.prefab.meta
--- a/Assets/Res_Addr/Projectile/Elite.meta
+++ b/Assets/Res_Addr/Projectile/Elite.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 69e0e0a2bd9e32648810b6c4e698f77d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Res_Addr/Projectile/Elite/P_Skull_Shaman_A.prefab
+++ b/Assets/Res_Addr/Projectile/Elite/P_Skull_Shaman_A.prefab
@ -0,0 +1,155 @@
+%YAML 1.1
+%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
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 223961062764596305}
+  - component: {fileID: 6311613290837446200}
+  - component: {fileID: 6782093134866277011}
+  m_Layer: 0
+  m_Name: P_Skull_Shaman_A
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &223961062764596305
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 907428178798376589}
+  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: 3212436743952790601}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &6311613290837446200
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 907428178798376589}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e5d2fd9d460da6a4d87b4be83a4cdc32, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Pierce: 0
+  str_HitEffect: PoisonHit
+  m_ShowTimeOverEffect: 0
+--- !u!65 &6782093134866277011
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 907428178798376589}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 3, y: 3, z: 3}
+  m_Center: {x: 0, y: 0, z: 0}
--- a/Assets/Res_Addr/Projectile/Elite/P_Skull_Shaman_A.prefab.meta
+++ b/Assets/Res_Addr/Projectile/Elite/P_Skull_Shaman_A.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 959123974437a3e469bb95c39c3909a6
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Script/Character/Mob/BullRushMobActor.cs
+++ b/Assets/Script/Character/Mob/BullRushMobActor.cs
@ -6,7 +6,7 @@ public class BullRushMobActor : MobActor
    protected override void Change_MobStatus(eMobStatus mobStatus)
    {
        if (mobStatus == eMobStatus.Battle)
-            Play_Attack(0, m_MonsterTableData.f_BaseATKSpeed);
+            Play_Attack(0, (float)m_Stat.Get_Stat(eStat.FinalAttackSpeed));
        else
            base.Change_MobStatus(mobStatus);
    }
--- a/Assets/Script/Character/Mob/MobActor.cs
+++ b/Assets/Script/Character/Mob/MobActor.cs
@ -184,7 +184,7 @@ public class MobActor : Actor
                        else if (m_attackCoolTime <= 0f)
                        {
                            m_attackCoolTime = 1f;
-                            Play_Attack(0, m_MonsterTableData.f_BaseATKSpeed);
+                            Play_Attack(0, (float)m_Stat.Get_Stat(eStat.FinalAttackSpeed));
                        }
                    }
                }
@ -445,6 +445,7 @@ public class MobActor : Actor
    {
        if (m_MobMark == null)
        {
+         
            m_MobMark = InGameInfo.Ins.Get_Obj(eObj.MobMark).GetComponent<MobMark>();
            m_MobMark.transform.localScale = Vector3.one * 0.2f;
        }
--- a/Assets/Script/Mgr/MobControlMgr.cs
+++ b/Assets/Script/Mgr/MobControlMgr.cs
@ -89,7 +89,6 @@ public class MobControlMgr : MyCoroutine
                    mob.Set(true, null, null, m_MonsterAppearData.n_SpawnerID, false);
                    mob.Set(mobData, rdnpos, actDie, indexCopy);
                    mob.Off();
-                    mob.m_SubRole = eSubRol.None;
                    mob.MagicID = 0;

                    ++makemobcount;
--- a/Assets/Script/Table/IngameStage/table_monsterlist.cs
+++ b/Assets/Script/Table/IngameStage/table_monsterlist.cs
@ -111,6 +111,13 @@ public class MonsterTableData : TableDataBase
        set { _ProjectileLifeTime3 = value; _ProjectileLifeTime3.RandomizeCryptoKey(); }
    } // 투사체 지속 시간

+    ObscuredInt _PassiveSkillID;
+    public int n_PassiveSkillID
+    {
+        get { return _PassiveSkillID; }
+        set { _PassiveSkillID = value; _PassiveSkillID.RandomizeCryptoKey(); }
+    } // 고유 드랍 아이템
+
    ObscuredString _ExtraSkill1;
    public string s_ExtraSkill1
    {
--- a/Assets/Script/Table/Skill/table_skilllist.cs
+++ b/Assets/Script/Table/Skill/table_skilllist.cs
@ -3,7 +3,7 @@ using CodeStage.AntiCheat.ObscuredTypes;
 using Newtonsoft.Json;
 using UnityEngine;

-public enum eSkillType { Active, Passive, JobPassive }
+public enum eSkillType { Active, Passive, JobPassive, MobPassive }
 public enum eSkillTarget { Enemy, Self, SelfEnemy, Team, Pet }
 public enum eSkillExtraType { None, Frost, Cure, Freezing, Blood, Poison, Burn, Stun, Slow, StatUp, ManaShield, SwordShield,
                              SpeedUp, DefenceDecrease, Aggro, VampirHeal, Knockback, Airborne, Curse, }
--- a/Assets/Script/Util/MyValue.cs
+++ b/Assets/Script/Util/MyValue.cs
@ -394,11 +394,14 @@ public class ActorStatInfo

            Set_Stat(true, eStat.BaseDmg, m_mobdata.f_BaseATKRate * m_moblvdata.n_MonsterATK);
            Set_Stat(true, eStat.MaxHP, m_mobdata.f_BaseHPRate * m_moblvdata.n_MonsterHP);
+            Set_Stat(true, eStat.HERO_ATK_SPD, m_mobdata.f_BaseATKSpeed);
            Set_Stat(true, eStat.HERO_MOVE_SPD, m_mobdata.f_BaseMOVSpeed);
            Set_Stat(true, eStat.DEF, m_mobdata.f_BaseDEFRate * m_moblvdata.n_MonsterDEF);
            Set_Stat(true, eStat.M_DEF, m_mobdata.f_BaseMDEFRate * m_moblvdata.n_MonsterMDEF);
            Set_Stat(true, eStat.ATK_SPD_Multiplier, 1);
            Set_Stat(true, eStat.MOVE_SPD_Multiplier, 1);
+
+            Set_MonsterSkillPassive();
        }

        // 세팅된 값으로 최종 데이터 설정
@ -765,6 +768,17 @@ public class ActorStatInfo
                break;
        }
    }
+    void Set_MonsterSkillPassive()
+    {
+        if (m_mobdata.n_PassiveSkillID > 0)
+        {
+            var skilldata = table_skilllist.Ins.Get_Data_orNull(m_mobdata.n_PassiveSkillID);
+            switch (skilldata.e_SkillEnhance)
+            {
+                case eSkillEnhance.ATK_SPD_Up: Set_Stat(true, eStat.HERO_ATK_SPD, skilldata.f_ExtraValue1); break;
+            }
+        }
+    }
    void Set_EquipItem()
    {
        if (!DSUtil.CheckNull(m_sdata))