Magic_Mirror

2025-02-07 09:27:55 +09:00 · 2025-02-07 09:27:55 +09:00 · 7eadf87a18
parent f7dc85bb2b
commit 7eadf87a18
11 changed files with 29926 additions and 4 deletions
--- a/2/Animations/Magicmirror/Anim_Magic_Mirror@Attack.fbx.meta
+++ b/2/Animations/Magicmirror/Anim_Magic_Mirror@Attack.fbx.meta
@ -1,7 +1,7 @@
 fileFormatVersion: 2
 guid: c7946da3160f62d4eb2e201a45ed80ff
 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.17191276
+        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
@ -1 +1 @@
-[{"n_SpawnerID": "1", "n_AppearMonsterLv": "5", "n_MonsterATK": "1", "n_MonsterDEF": "-10", "n_MonsterMDEF": "-10", "n_MonsterHP": "900", "s_AppearMonster": "101|102|103|104", "e_SpawnerType": "Random", "f_SpawnerDelay": "4", "n_MaxMonsterCount": "8", "f_PatrolRange": "3", "n_DropExp": "10", "n_DropGold": "1", "n_DropReward": "1001"}, {"n_SpawnerID": "2", "n_AppearMonsterLv": "10", "n_MonsterATK": "2", "n_MonsterDEF": "2", "n_MonsterMDEF": "2", "n_MonsterHP": "2", "s_AppearMonster": "105|106|107", "e_SpawnerType": "Order", "f_SpawnerDelay": "3.8", "n_MaxMonsterCount": "10", "f_PatrolRange": "4", "n_DropExp": "15", "n_DropGold": "2", "n_DropReward": "1002"}, {"n_SpawnerID": "3", "n_AppearMonsterLv": "15", "n_MonsterATK": "3", "n_MonsterDEF": "3", "n_MonsterMDEF": "3", "n_MonsterHP": "3", "s_AppearMonster": "108|109|110", "e_SpawnerType": "Phase", "f_SpawnerDelay": "3.6", "n_MaxMonsterCount": "3", "f_PatrolRange": "5", "n_DropExp": "20", "n_DropGold": "3", "n_DropReward": "1001"}, {"n_SpawnerID": "4", "n_AppearMonsterLv": "20", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "111|112|113", "e_SpawnerType": "PhaseAllKill", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "5", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "1003"}, {"n_SpawnerID": "5", "n_AppearMonsterLv": "25", "n_MonsterATK": "5", "n_MonsterDEF": "1", "n_MonsterMDEF": "1", "n_MonsterHP": "100", "s_AppearMonster": "114|115|116|117", "e_SpawnerType": "Random", "f_SpawnerDelay": "4", "n_MaxMonsterCount": "10", "f_PatrolRange": "3", "n_DropExp": "10", "n_DropGold": "1", "n_DropReward": "1001"}, {"n_SpawnerID": "6", "n_AppearMonsterLv": "30", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "118|119|120", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "5", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "1003"}]
+[{"n_SpawnerID": "1", "n_AppearMonsterLv": "5", "n_MonsterATK": "1", "n_MonsterDEF": "-10", "n_MonsterMDEF": "-10", "n_MonsterHP": "900", "s_AppearMonster": "101|102|103|104", "e_SpawnerType": "Random", "f_SpawnerDelay": "4", "n_MaxMonsterCount": "8", "f_PatrolRange": "3", "n_DropExp": "10", "n_DropGold": "1", "n_DropReward": "1001"}, {"n_SpawnerID": "2", "n_AppearMonsterLv": "10", "n_MonsterATK": "2", "n_MonsterDEF": "2", "n_MonsterMDEF": "2", "n_MonsterHP": "2", "s_AppearMonster": "105|106|107", "e_SpawnerType": "Order", "f_SpawnerDelay": "3.8", "n_MaxMonsterCount": "10", "f_PatrolRange": "4", "n_DropExp": "15", "n_DropGold": "2", "n_DropReward": "1002"}, {"n_SpawnerID": "3", "n_AppearMonsterLv": "15", "n_MonsterATK": "3", "n_MonsterDEF": "3", "n_MonsterMDEF": "3", "n_MonsterHP": "3", "s_AppearMonster": "108|109|110", "e_SpawnerType": "Phase", "f_SpawnerDelay": "3.6", "n_MaxMonsterCount": "3", "f_PatrolRange": "5", "n_DropExp": "20", "n_DropGold": "3", "n_DropReward": "1001"}, {"n_SpawnerID": "4", "n_AppearMonsterLv": "20", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "111|112|113", "e_SpawnerType": "PhaseAllKill", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "5", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "1003"}, {"n_SpawnerID": "5", "n_AppearMonsterLv": "25", "n_MonsterATK": "5", "n_MonsterDEF": "1", "n_MonsterMDEF": "1", "n_MonsterHP": "100", "s_AppearMonster": "114|115|116|117", "e_SpawnerType": "Random", "f_SpawnerDelay": "4", "n_MaxMonsterCount": "10", "f_PatrolRange": "3", "n_DropExp": "10", "n_DropGold": "1", "n_DropReward": "1001"}, {"n_SpawnerID": "6", "n_AppearMonsterLv": "30", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "118|119|120", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "5", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "1003"}, {"n_SpawnerID": "7", "n_AppearMonsterLv": "30", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "121|122|123", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "5", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "1003"}]
--- a/Assets/ResWork/Table/Export/MonsterList.json
+++ b/Assets/ResWork/Table/Export/MonsterList.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
@ -319,6 +319,54 @@ MonoBehaviour:
  m_hasFontAssetChanged: 0
  m_renderer: {fileID: 7247872503426531795}
  m_maskType: 0
+--- !u!1 &1792605312356674150
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6769070107967770152}
+  - component: {fileID: 3582224662933864019}
+  m_Layer: 3
+  m_Name: 7
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 2147483647
+  m_IsActive: 1
+--- !u!4 &6769070107967770152
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1792605312356674150}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 75.5, y: 0.01, z: 114.6}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1756249005601403924}
+  m_Father: {fileID: 7786833865820079638}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3582224662933864019
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1792605312356674150}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 06269e6c1653db34090895cd16244df9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  SpawnerID: 7
+  MobGenRange: 10
+  text_lv: {fileID: 6547809655938240747}
 --- !u!1 &1827840718064107711
 GameObject:
  m_ObjectHideFlags: 0
@ -845,6 +893,178 @@ MonoBehaviour:
  bakeCellSize: {x: 3, y: 10.75, z: 2}
  mergeDownsampleIterations: 0
  visibilityLayer: -1
+--- !u!1 &2482112238511350406
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1756249005601403924}
+  - component: {fileID: 6277980708585315334}
+  - component: {fileID: 6547809655938240747}
+  m_Layer: 3
+  m_Name: lv
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 119
+  m_IsActive: 1
+--- !u!224 &1756249005601403924
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2482112238511350406}
+  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: 6769070107967770152}
+  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 &6277980708585315334
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2482112238511350406}
+  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 &6547809655938240747
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2482112238511350406}
+  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: 6277980708585315334}
+  m_maskType: 0
 --- !u!1 &3119567929381174615
 GameObject:
  m_ObjectHideFlags: 0
@ -66964,6 +67184,7 @@ Transform:
  - {fileID: 9149960666256926434}
  - {fileID: 4201117426651649268}
  - {fileID: 8802925289514687336}
+  - {fileID: 6769070107967770152}
  m_Father: {fileID: 6738690448854471834}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &8973930304619307241
--- a/Assets/Res_Addr/Projectile/Mob/P_Magic_Mirror_A.prefab
+++ b/Assets/Res_Addr/Projectile/Mob/P_Magic_Mirror_A.prefab
--- a/Assets/Res_Addr/Projectile/Mob/P_Magic_Mirror_A.prefab.meta
+++ b/Assets/Res_Addr/Projectile/Mob/P_Magic_Mirror_A.prefab.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 632c379337e544c4fb5fa766e285aded
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Res_Addr/Projectile/Mob/P_Magic_Mirror_B.prefab
+++ b/Assets/Res_Addr/Projectile/Mob/P_Magic_Mirror_B.prefab
--- a/Assets/Res_Addr/Projectile/Mob/P_Magic_Mirror_B.prefab.meta
+++ b/Assets/Res_Addr/Projectile/Mob/P_Magic_Mirror_B.prefab.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f3c7c9392395d304f9348389e27a1d12
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Res_Addr/Projectile/Mob/P_Magic_Mirror_C.prefab
+++ b/Assets/Res_Addr/Projectile/Mob/P_Magic_Mirror_C.prefab
--- a/Assets/Res_Addr/Projectile/Mob/P_Magic_Mirror_C.prefab.meta
+++ b/Assets/Res_Addr/Projectile/Mob/P_Magic_Mirror_C.prefab.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8da31456c6775694e954c92f3f77961d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: