From 24db104fd05dee40b96de0f19736dd626a31343f Mon Sep 17 00:00:00 2001 From: mic673568500 <> Date: Mon, 23 Oct 2023 16:54:58 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=90=8C=E6=AD=A5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Structure/S00012_XZ/S00012_XZ.FBX.meta | 2 +- .../Article/Structure/S00015_HY/S00015_HY.FBX | 3 + .../Structure/S00015_HY/S00015_HY.FBX.meta | 119 ++++++++++++ .../Textures/Structure/S00015_HY.meta} | 2 +- .../Textures/Structure/S00015_HY/Mat.meta | 8 + .../S00015_HY/Mat/M_S00015_HY01_01.mat | 144 ++++++++++++++ .../S00015_HY/Mat/M_S00015_HY01_01.mat.meta | 8 + .../S00015_HY/Mat/M_S00015_HY02_01.mat | 142 ++++++++++++++ .../S00015_HY/Mat/M_S00015_HY02_01.mat.meta | 8 + .../Textures/Structure/S00015_HY/Textuer.meta | 8 + .../S00015_HY/Textuer/T_S00015_HY_d_01.jpg | 3 + .../Textuer/T_S00015_HY_d_01.jpg.meta | 179 ++++++++++++++++++ .../Decorate/D00005_XZ/D00005_XZ.FBX.meta | 2 +- .../Decorate/D00006_XZ/D00006_XZ.FBX.meta | 2 +- .../Prefabs/Enemy/P_E00011_G00017.prefab | 104 ++++++++++ .../Prefabs/Enemy/P_E00011_G00018.prefab | 104 ++++++++++ .../Prefabs/Enemy/P_E00011_G00019.prefab | 104 ++++++++++ .../Prefabs/Enemy/P_E00012_G00018.prefab | 99 ++++++++++ .../Prefabs/Enemy/P_E00012_G00019.prefab | 104 ++++++++++ .../Prefabs/Enemy/P_E00013_G00018.prefab | 104 ++++++++++ .../Prefabs/Enemy/P_E00013_G00019.prefab | 104 ++++++++++ .../Prefabs/Enemy/P_E00014_G00018.prefab | 104 ++++++++++ .../Prefabs/Enemy/P_E00014_G00019.prefab | 104 ++++++++++ .../Prefabs/Enemy/P_E00018_G00022.prefab | 103 +++++++++- .../Prefabs/Enemy/P_E00019_G00008.prefab | 99 ++++++++++ .../Prefabs/Enemy/P_E00019_G00011.prefab | 104 ++++++++++ .../Prefabs/Enemy/P_E00019_G00014.prefab | 104 ++++++++++ .../Prefabs/Enemy/P_E00019_G00018.prefab | 108 ++++++++++- .../Prefabs/Enemy/P_E00021_G00022.prefab | 104 ++++++++++ .../Prefabs/Structure/P_S00015_HY_01.prefab | 108 +++++++++++ .../Structure/P_S00015_HY_01.prefab.meta | 7 + .../Art/UI/Prefab/Story/UIStoryMain.prefab | 14 +- .../UI/Story/UIStoryMainController.cs | 116 +++++++++++- .../UI/UI_Interface/UI_InterfaceController.cs | 30 ++- 34 files changed, 2434 insertions(+), 24 deletions(-) create mode 100644 ProjectNLD/Assets/Art/Article/Structure/S00015_HY/S00015_HY.FBX create mode 100644 ProjectNLD/Assets/Art/Article/Structure/S00015_HY/S00015_HY.FBX.meta rename ProjectNLD/Assets/Art/{temp.meta => Article/Textures/Structure/S00015_HY.meta} (77%) create mode 100644 ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY/Mat.meta create mode 100644 ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY/Mat/M_S00015_HY01_01.mat create mode 100644 ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY/Mat/M_S00015_HY01_01.mat.meta create mode 100644 ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY/Mat/M_S00015_HY02_01.mat create mode 100644 ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY/Mat/M_S00015_HY02_01.mat.meta create mode 100644 ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY/Textuer.meta create mode 100644 ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY/Textuer/T_S00015_HY_d_01.jpg create mode 100644 ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY/Textuer/T_S00015_HY_d_01.jpg.meta create mode 100644 ProjectNLD/Assets/Art/Character/Prefabs/Structure/P_S00015_HY_01.prefab create mode 100644 ProjectNLD/Assets/Art/Character/Prefabs/Structure/P_S00015_HY_01.prefab.meta diff --git a/ProjectNLD/Assets/Art/Article/Structure/S00012_XZ/S00012_XZ.FBX.meta b/ProjectNLD/Assets/Art/Article/Structure/S00012_XZ/S00012_XZ.FBX.meta index 10670ca90e5..446cc3f91d1 100644 --- a/ProjectNLD/Assets/Art/Article/Structure/S00012_XZ/S00012_XZ.FBX.meta +++ b/ProjectNLD/Assets/Art/Article/Structure/S00012_XZ/S00012_XZ.FBX.meta @@ -34,7 +34,7 @@ ModelImporter: animationDoRetargetingWarnings: 0 importAnimatedCustomProperties: 0 importConstraints: 0 - animationCompression: 1 + animationCompression: 3 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 diff --git a/ProjectNLD/Assets/Art/Article/Structure/S00015_HY/S00015_HY.FBX b/ProjectNLD/Assets/Art/Article/Structure/S00015_HY/S00015_HY.FBX new file mode 100644 index 00000000000..719f46ffdf6 --- /dev/null +++ b/ProjectNLD/Assets/Art/Article/Structure/S00015_HY/S00015_HY.FBX @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7cfc3d4d1e28492317d93675d5b8697296ff94b92123cf5e4cebadbbce7bb56f +size 46720 diff --git a/ProjectNLD/Assets/Art/Article/Structure/S00015_HY/S00015_HY.FBX.meta b/ProjectNLD/Assets/Art/Article/Structure/S00015_HY/S00015_HY.FBX.meta new file mode 100644 index 00000000000..7ed014a01a4 --- /dev/null +++ b/ProjectNLD/Assets/Art/Article/Structure/S00015_HY/S00015_HY.FBX.meta @@ -0,0 +1,119 @@ +fileFormatVersion: 2 +guid: 1ed9d62254b433548858000a60c58c05 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: M_S00015_HY01_01 + second: {fileID: 2100000, guid: f580967008915494cacbdcaa8f6e1466, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: M_S00015_HY02_01 + second: {fileID: 2100000, guid: 51a2258b51f7ec1468231ac97211e740, type: 2} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 3 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectNLD/Assets/Art/temp.meta b/ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY.meta similarity index 77% rename from ProjectNLD/Assets/Art/temp.meta rename to ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY.meta index 95c6b912182..a3794c27d31 100644 --- a/ProjectNLD/Assets/Art/temp.meta +++ b/ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 78eac6d4a450b244188693306a8d0a25 +guid: 1821550d63abb6e42a31394074961b5b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY/Mat.meta b/ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY/Mat.meta new file mode 100644 index 00000000000..408fcf5f909 --- /dev/null +++ b/ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY/Mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 57a27ea6ef13b4441b78a1200d2c4a39 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY/Mat/M_S00015_HY01_01.mat b/ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY/Mat/M_S00015_HY01_01.mat new file mode 100644 index 00000000000..9fce7cdab3c --- /dev/null +++ b/ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY/Mat/M_S00015_HY01_01.mat @@ -0,0 +1,144 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_S00015_HY01_01 + m_Shader: {fileID: 4800000, guid: e1d89b676619d79428b778c9cb52f5ae, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 86dc3b6be5cd93747b1d4cba023f3438, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MaskTex: + m_Texture: {fileID: 2800000, guid: 86bb922c06645a2418b220d6c068debf, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _Factor: 0.32 + - _GlossMapScale: 1 + - _Glossiness: 0.14142135 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Outline: 0.03 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.14142135 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + - _shadowScale: 0.5 + - _specularScaleB: 2 + - _specularScaleG: 2 + m_Colors: + - _BaseColor: {r: 0.79073066, g: 0.79073066, b: 0.79073066, a: 1} + - _Color: {r: 0.79073066, g: 0.79073066, b: 0.79073066, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _OutlineColor: {r: 0.17999998, g: 0.10979997, b: 0.054899976, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &4143203752742457422 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 diff --git a/ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY/Mat/M_S00015_HY01_01.mat.meta b/ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY/Mat/M_S00015_HY01_01.mat.meta new file mode 100644 index 00000000000..1d91fe11778 --- /dev/null +++ b/ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY/Mat/M_S00015_HY01_01.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f580967008915494cacbdcaa8f6e1466 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY/Mat/M_S00015_HY02_01.mat b/ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY/Mat/M_S00015_HY02_01.mat new file mode 100644 index 00000000000..239e9edea3c --- /dev/null +++ b/ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY/Mat/M_S00015_HY02_01.mat @@ -0,0 +1,142 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-1905157537404268720 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_S00015_HY02_01 + m_Shader: {fileID: 4800000, guid: e1d89b676619d79428b778c9cb52f5ae, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 86dc3b6be5cd93747b1d4cba023f3438, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MaskTex: + m_Texture: {fileID: 2800000, guid: 86bb922c06645a2418b220d6c068debf, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _Factor: 0.32 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Outline: 0.016 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + - _shadowScale: 0.5 + - _specularScaleB: 2 + - _specularScaleG: 2 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _OutlineColor: {r: 0.17999998, g: 0.10979997, b: 0.054899976, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY/Mat/M_S00015_HY02_01.mat.meta b/ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY/Mat/M_S00015_HY02_01.mat.meta new file mode 100644 index 00000000000..a985b1dc5ed --- /dev/null +++ b/ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY/Mat/M_S00015_HY02_01.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 51a2258b51f7ec1468231ac97211e740 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY/Textuer.meta b/ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY/Textuer.meta new file mode 100644 index 00000000000..a55f5a027ac --- /dev/null +++ b/ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY/Textuer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: da0bcb32344f2e447bea97208fdbacad +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY/Textuer/T_S00015_HY_d_01.jpg b/ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY/Textuer/T_S00015_HY_d_01.jpg new file mode 100644 index 00000000000..3bbc40b3a4e --- /dev/null +++ b/ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY/Textuer/T_S00015_HY_d_01.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c0d8ae31c589f56ea38b9de65c0eef432f7a75ff40e7aadfa85c2bff8836716b +size 204574 diff --git a/ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY/Textuer/T_S00015_HY_d_01.jpg.meta b/ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY/Textuer/T_S00015_HY_d_01.jpg.meta new file mode 100644 index 00000000000..21e6f265cab --- /dev/null +++ b/ProjectNLD/Assets/Art/Article/Textures/Structure/S00015_HY/Textuer/T_S00015_HY_d_01.jpg.meta @@ -0,0 +1,179 @@ +fileFormatVersion: 2 +guid: 86dc3b6be5cd93747b1d4cba023f3438 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectNLD/Assets/Art/Character/Models/Decorate/D00005_XZ/D00005_XZ.FBX.meta b/ProjectNLD/Assets/Art/Character/Models/Decorate/D00005_XZ/D00005_XZ.FBX.meta index 87fd1a88753..fea62849fd5 100644 --- a/ProjectNLD/Assets/Art/Character/Models/Decorate/D00005_XZ/D00005_XZ.FBX.meta +++ b/ProjectNLD/Assets/Art/Character/Models/Decorate/D00005_XZ/D00005_XZ.FBX.meta @@ -29,7 +29,7 @@ ModelImporter: animationDoRetargetingWarnings: 0 importAnimatedCustomProperties: 0 importConstraints: 0 - animationCompression: 1 + animationCompression: 3 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 diff --git a/ProjectNLD/Assets/Art/Character/Models/Decorate/D00006_XZ/D00006_XZ.FBX.meta b/ProjectNLD/Assets/Art/Character/Models/Decorate/D00006_XZ/D00006_XZ.FBX.meta index b2a8a63f250..bb36545a9c2 100644 --- a/ProjectNLD/Assets/Art/Character/Models/Decorate/D00006_XZ/D00006_XZ.FBX.meta +++ b/ProjectNLD/Assets/Art/Character/Models/Decorate/D00006_XZ/D00006_XZ.FBX.meta @@ -29,7 +29,7 @@ ModelImporter: animationDoRetargetingWarnings: 0 importAnimatedCustomProperties: 0 importConstraints: 0 - animationCompression: 1 + animationCompression: 3 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 diff --git a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00011_G00017.prefab b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00011_G00017.prefab index 23b658e17a9..3fcb2f71ff0 100644 --- a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00011_G00017.prefab +++ b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00011_G00017.prefab @@ -869,6 +869,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 1382477688290633193, guid: 058e2c5756a0aa740a80bba2f74b6e1c, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5448293098163532369} - targetCorrespondingSourceObject: {fileID: -5313860892930385167, guid: 058e2c5756a0aa740a80bba2f74b6e1c, type: 3} insertIndex: -1 @@ -887,6 +891,106 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2859411272020596320} m_PrefabAsset: {fileID: 0} +--- !u!4 &3783348339005617033 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1382477688290633193, guid: 058e2c5756a0aa740a80bba2f74b6e1c, + type: 3} + m_PrefabInstance: {fileID: 2859411272020596320} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5482711199873406394 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3783348339005617033} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.3272829 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.099745445 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.024923144 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.7066675 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.024924124 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.70666736 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_Name + value: G_emoji + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, type: 3} +--- !u!4 &5448293098163532369 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + m_PrefabInstance: {fileID: 5482711199873406394} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6228700953805135239 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00011_G00018.prefab b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00011_G00018.prefab index 6bd619c38b1..4893035e5f7 100644 --- a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00011_G00018.prefab +++ b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00011_G00018.prefab @@ -624,12 +624,22 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 1382477688290633193, guid: 058e2c5756a0aa740a80bba2f74b6e1c, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5304038897368292833} - targetCorrespondingSourceObject: {fileID: -5313860892930385167, guid: 058e2c5756a0aa740a80bba2f74b6e1c, type: 3} insertIndex: -1 addedObject: {fileID: 4827057052339143280} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 058e2c5756a0aa740a80bba2f74b6e1c, type: 3} +--- !u!4 &945085346456050266 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1382477688290633193, guid: 058e2c5756a0aa740a80bba2f74b6e1c, + type: 3} + m_PrefabInstance: {fileID: 2175821634005893043} + m_PrefabAsset: {fileID: 0} --- !u!4 &1853419550834071640 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 058e2c5756a0aa740a80bba2f74b6e1c, @@ -642,6 +652,100 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2175821634005893043} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5625279862236297738 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 945085346456050266} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.3272829 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.099745445 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.024923144 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.7066675 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.024924124 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.70666736 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_Name + value: G_emoji + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, type: 3} +--- !u!4 &5304038897368292833 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + m_PrefabInstance: {fileID: 5625279862236297738} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6644246364828169407 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00011_G00019.prefab b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00011_G00019.prefab index eb840a3ea78..6ece6c8c8da 100644 --- a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00011_G00019.prefab +++ b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00011_G00019.prefab @@ -124,6 +124,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 1382477688290633193, guid: 058e2c5756a0aa740a80bba2f74b6e1c, + type: 3} + insertIndex: -1 + addedObject: {fileID: 8460837175473414585} - targetCorrespondingSourceObject: {fileID: -5313860892930385167, guid: 058e2c5756a0aa740a80bba2f74b6e1c, type: 3} insertIndex: -1 @@ -136,6 +140,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1095658920624650958} m_PrefabAsset: {fileID: 0} +--- !u!4 &2025216691040329511 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1382477688290633193, guid: 058e2c5756a0aa740a80bba2f74b6e1c, + type: 3} + m_PrefabInstance: {fileID: 1095658920624650958} + m_PrefabAsset: {fileID: 0} --- !u!4 &4140444507568775231 stripped Transform: m_CorrespondingSourceObject: {fileID: -5313860892930385167, guid: 058e2c5756a0aa740a80bba2f74b6e1c, @@ -216,3 +226,97 @@ Transform: type: 3} m_PrefabInstance: {fileID: 5931778429271794690} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8277712769390626386 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2025216691040329511} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.3272829 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.099745445 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.024923144 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.7066675 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.024924124 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.70666736 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_Name + value: G_emoji + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, type: 3} +--- !u!4 &8460837175473414585 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + m_PrefabInstance: {fileID: 8277712769390626386} + m_PrefabAsset: {fileID: 0} diff --git a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00012_G00018.prefab b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00012_G00018.prefab index 000ccdf03f6..6db3dfcd229 100644 --- a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00012_G00018.prefab +++ b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00012_G00018.prefab @@ -124,6 +124,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8765025302421469380, guid: 0cc5cf5079c509840a78fcc1246137c6, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1375529923636100140} - targetCorrespondingSourceObject: {fileID: -5313860892930385167, guid: 0cc5cf5079c509840a78fcc1246137c6, type: 3} insertIndex: -1 @@ -142,6 +146,101 @@ Transform: type: 3} m_PrefabInstance: {fileID: 316657617959923216} m_PrefabAsset: {fileID: 0} +--- !u!4 &9063316678146283220 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8765025302421469380, guid: 0cc5cf5079c509840a78fcc1246137c6, + type: 3} + m_PrefabInstance: {fileID: 316657617959923216} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1485172271927696327 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 9063316678146283220} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.92956525 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.0997455 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.02492329 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.7066674 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.024923978 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.70666736 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_Name + value: G_emoji + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, type: 3} +--- !u!4 &1375529923636100140 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + m_PrefabInstance: {fileID: 1485172271927696327} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3071986025605685743 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00012_G00019.prefab b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00012_G00019.prefab index 295abd1c0f6..307946dd238 100644 --- a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00012_G00019.prefab +++ b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00012_G00019.prefab @@ -32,6 +32,100 @@ Transform: - {fileID: 7328339980370750062} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &3380925834305820262 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8148783305257429100} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.327283 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.09974546 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.024923228 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.7066675 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.024924036 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.7066674 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_Name + value: G_emoji + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, type: 3} +--- !u!4 &2981892436751561101 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + m_PrefabInstance: {fileID: 3380925834305820262} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7077907229474016645 PrefabInstance: m_ObjectHideFlags: 0 @@ -124,6 +218,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 1382477688290633193, guid: 0cc5cf5079c509840a78fcc1246137c6, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2981892436751561101} - targetCorrespondingSourceObject: {fileID: -5313860892930385167, guid: 0cc5cf5079c509840a78fcc1246137c6, type: 3} insertIndex: -1 @@ -142,6 +240,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 7077907229474016645} m_PrefabAsset: {fileID: 0} +--- !u!4 &8148783305257429100 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1382477688290633193, guid: 0cc5cf5079c509840a78fcc1246137c6, + type: 3} + m_PrefabInstance: {fileID: 7077907229474016645} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7658851521774915866 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00013_G00018.prefab b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00013_G00018.prefab index 5e79dfa13fe..1000dc3f6bd 100644 --- a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00013_G00018.prefab +++ b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00013_G00018.prefab @@ -124,6 +124,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 1382477688290633193, guid: 793892ba24f75444e944915fb441c71e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 6085710632435382835} - targetCorrespondingSourceObject: {fileID: -5313860892930385167, guid: 793892ba24f75444e944915fb441c71e, type: 3} insertIndex: -1 @@ -142,6 +146,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2713168864485820136} m_PrefabAsset: {fileID: 0} +--- !u!4 &3929549653349278465 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1382477688290633193, guid: 793892ba24f75444e944915fb441c71e, + type: 3} + m_PrefabInstance: {fileID: 2713168864485820136} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3167093207187224457 PrefabInstance: m_ObjectHideFlags: 0 @@ -216,3 +226,97 @@ Transform: type: 3} m_PrefabInstance: {fileID: 3167093207187224457} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6052399120404815320 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3929549653349278465} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.3272829 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.09974548 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.024923148 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.7066676 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.024924127 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.7066673 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_Name + value: G_emoji + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, type: 3} +--- !u!4 &6085710632435382835 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + m_PrefabInstance: {fileID: 6052399120404815320} + m_PrefabAsset: {fileID: 0} diff --git a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00013_G00019.prefab b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00013_G00019.prefab index e62d1d99efc..7bfb6323400 100644 --- a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00013_G00019.prefab +++ b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00013_G00019.prefab @@ -32,6 +32,100 @@ Transform: - {fileID: 8290604929561812302} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &5425401659180465301 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7470082125701078860} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.3272829 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.09974545 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.024923142 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.7066675 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.024924124 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.70666736 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_Name + value: G_emoji + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, type: 3} +--- !u!4 &5530525264669924222 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + m_PrefabInstance: {fileID: 5425401659180465301} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7532991818060611097 PrefabInstance: m_ObjectHideFlags: 0 @@ -198,6 +292,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 1382477688290633193, guid: 793892ba24f75444e944915fb441c71e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5530525264669924222} - targetCorrespondingSourceObject: {fileID: -5313860892930385167, guid: 793892ba24f75444e944915fb441c71e, type: 3} insertIndex: -1 @@ -210,6 +308,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 8396007401754409637} m_PrefabAsset: {fileID: 0} +--- !u!4 &7470082125701078860 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1382477688290633193, guid: 793892ba24f75444e944915fb441c71e, + type: 3} + m_PrefabInstance: {fileID: 8396007401754409637} + m_PrefabAsset: {fileID: 0} --- !u!4 &8290604929561812302 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 793892ba24f75444e944915fb441c71e, diff --git a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00014_G00018.prefab b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00014_G00018.prefab index 84b2dfd4c1b..650ddf363b1 100644 --- a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00014_G00018.prefab +++ b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00014_G00018.prefab @@ -124,6 +124,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 1382477688290633193, guid: 5dc2a29d6b349714fab2a5cea4a4f041, + type: 3} + insertIndex: -1 + addedObject: {fileID: 4677601927021932278} - targetCorrespondingSourceObject: {fileID: -5313860892930385167, guid: 5dc2a29d6b349714fab2a5cea4a4f041, type: 3} insertIndex: -1 @@ -136,12 +140,112 @@ Transform: type: 3} m_PrefabInstance: {fileID: 166287474253784506} m_PrefabAsset: {fileID: 0} +--- !u!4 &1252363198779686995 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1382477688290633193, guid: 5dc2a29d6b349714fab2a5cea4a4f041, + type: 3} + m_PrefabInstance: {fileID: 166287474253784506} + m_PrefabAsset: {fileID: 0} --- !u!4 &3751386612856340299 stripped Transform: m_CorrespondingSourceObject: {fileID: -5313860892930385167, guid: 5dc2a29d6b349714fab2a5cea4a4f041, type: 3} m_PrefabInstance: {fileID: 166287474253784506} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5143277170389305629 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1252363198779686995} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.3272829 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.09974546 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.024923146 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.7066675 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.024924127 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.70666736 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_Name + value: G_emoji + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, type: 3} +--- !u!4 &4677601927021932278 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + m_PrefabInstance: {fileID: 5143277170389305629} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8327263485079681465 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00014_G00019.prefab b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00014_G00019.prefab index 56eb7252cc0..74afd281f86 100644 --- a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00014_G00019.prefab +++ b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00014_G00019.prefab @@ -124,6 +124,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 1382477688290633193, guid: 5dc2a29d6b349714fab2a5cea4a4f041, + type: 3} + insertIndex: -1 + addedObject: {fileID: 6931865170533535580} - targetCorrespondingSourceObject: {fileID: -5313860892930385167, guid: 5dc2a29d6b349714fab2a5cea4a4f041, type: 3} insertIndex: -1 @@ -136,6 +140,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1071423099176011987} m_PrefabAsset: {fileID: 0} +--- !u!4 &2157780040996072762 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1382477688290633193, guid: 5dc2a29d6b349714fab2a5cea4a4f041, + type: 3} + m_PrefabInstance: {fileID: 1071423099176011987} + m_PrefabAsset: {fileID: 0} --- !u!4 &4080026026191852066 stripped Transform: m_CorrespondingSourceObject: {fileID: -5313860892930385167, guid: 5dc2a29d6b349714fab2a5cea4a4f041, @@ -216,3 +226,97 @@ Transform: type: 3} m_PrefabInstance: {fileID: 6069411832400018726} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7473820167352395959 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2157780040996072762} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.3272829 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.09974546 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.024923146 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.7066675 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.024924127 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.70666736 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_Name + value: G_emoji + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, type: 3} +--- !u!4 &6931865170533535580 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + m_PrefabInstance: {fileID: 7473820167352395959} + m_PrefabAsset: {fileID: 0} diff --git a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00018_G00022.prefab b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00018_G00022.prefab index 681def5922c..77a04410a79 100644 --- a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00018_G00022.prefab +++ b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00018_G00022.prefab @@ -106,6 +106,95 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2131590541301288549} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2282815038087245635 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2520624126572233877} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.9295651 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.09974549 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.02492315 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.7066675 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.02492413 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.70666736 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_Name + value: G_emoji + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, type: 3} +--- !u!4 &1739666349264816296 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + m_PrefabInstance: {fileID: 2282815038087245635} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6582202561313012817 PrefabInstance: m_ObjectHideFlags: 0 @@ -132,7 +221,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: ff9700a3b4433204baa92ef2ed0df28d, type: 3} propertyPath: m_LocalPosition.x - value: -9.337811 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: ff9700a3b4433204baa92ef2ed0df28d, type: 3} @@ -142,7 +231,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: ff9700a3b4433204baa92ef2ed0df28d, type: 3} propertyPath: m_LocalPosition.z - value: -11.706042 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: ff9700a3b4433204baa92ef2ed0df28d, type: 3} @@ -198,12 +287,22 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8765025302421469380, guid: ff9700a3b4433204baa92ef2ed0df28d, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1739666349264816296} - targetCorrespondingSourceObject: {fileID: -5313860892930385167, guid: ff9700a3b4433204baa92ef2ed0df28d, type: 3} insertIndex: -1 addedObject: {fileID: 6096133298496240940} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ff9700a3b4433204baa92ef2ed0df28d, type: 3} +--- !u!4 &2520624126572233877 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8765025302421469380, guid: ff9700a3b4433204baa92ef2ed0df28d, + type: 3} + m_PrefabInstance: {fileID: 6582202561313012817} + m_PrefabAsset: {fileID: 0} --- !u!4 &6688433850655644602 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: ff9700a3b4433204baa92ef2ed0df28d, diff --git a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00019_G00008.prefab b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00019_G00008.prefab index ff14e68f2f4..cf36eb5d7c6 100644 --- a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00019_G00008.prefab +++ b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00019_G00008.prefab @@ -32,6 +32,95 @@ Transform: - {fileID: 8901578986550720466} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &4238341862308401145 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 405846798368172285} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.9295651 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.099745475 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.024923144 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.7066675 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.024924124 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.70666736 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_Name + value: G_emoji + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, type: 3} +--- !u!4 &4421167087468292114 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + m_PrefabInstance: {fileID: 4238341862308401145} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7193310153547481094 PrefabInstance: m_ObjectHideFlags: 0 @@ -198,12 +287,22 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8765025302421469380, guid: 5bccc794d486ced4fbedd51a7ad6a12b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 4421167087468292114} - targetCorrespondingSourceObject: {fileID: -5313860892930385167, guid: 5bccc794d486ced4fbedd51a7ad6a12b, type: 3} insertIndex: -1 addedObject: {fileID: 852542703087057426} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5bccc794d486ced4fbedd51a7ad6a12b, type: 3} +--- !u!4 &405846798368172285 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8765025302421469380, guid: 5bccc794d486ced4fbedd51a7ad6a12b, + type: 3} + m_PrefabInstance: {fileID: 8935840475635683385} + m_PrefabAsset: {fileID: 0} --- !u!4 &5351160628886751944 stripped Transform: m_CorrespondingSourceObject: {fileID: -5313860892930385167, guid: 5bccc794d486ced4fbedd51a7ad6a12b, diff --git a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00019_G00011.prefab b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00019_G00011.prefab index 1cd652a1cfd..523d847cc64 100644 --- a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00019_G00011.prefab +++ b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00019_G00011.prefab @@ -32,6 +32,100 @@ Transform: - {fileID: 4241597525237933433} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &261856353282557598 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3348456175475730299} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.3272829 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.09974547 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.024923144 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.7066675 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.024924124 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.70666736 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_Name + value: G_emoji + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, type: 3} +--- !u!4 &299759349233574261 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + m_PrefabInstance: {fileID: 261856353282557598} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4420167605227537042 PrefabInstance: m_ObjectHideFlags: 0 @@ -118,6 +212,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 1382477688290633193, guid: 5bccc794d486ced4fbedd51a7ad6a12b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 299759349233574261} - targetCorrespondingSourceObject: {fileID: -5313860892930385167, guid: 5bccc794d486ced4fbedd51a7ad6a12b, type: 3} insertIndex: -1 @@ -130,6 +228,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4420167605227537042} m_PrefabAsset: {fileID: 0} +--- !u!4 &3348456175475730299 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1382477688290633193, guid: 5bccc794d486ced4fbedd51a7ad6a12b, + type: 3} + m_PrefabInstance: {fileID: 4420167605227537042} + m_PrefabAsset: {fileID: 0} --- !u!4 &4241597525237933433 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 5bccc794d486ced4fbedd51a7ad6a12b, diff --git a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00019_G00014.prefab b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00019_G00014.prefab index 2e232526a8d..42401d6d3e6 100644 --- a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00019_G00014.prefab +++ b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00019_G00014.prefab @@ -124,6 +124,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 1382477688290633193, guid: 5bccc794d486ced4fbedd51a7ad6a12b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 6858974254605872972} - targetCorrespondingSourceObject: {fileID: -5313860892930385167, guid: 5bccc794d486ced4fbedd51a7ad6a12b, type: 3} insertIndex: -1 @@ -136,12 +140,112 @@ Transform: type: 3} m_PrefabInstance: {fileID: 325016726498095061} m_PrefabAsset: {fileID: 0} +--- !u!4 &1706086765012306492 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1382477688290633193, guid: 5bccc794d486ced4fbedd51a7ad6a12b, + type: 3} + m_PrefabInstance: {fileID: 325016726498095061} + m_PrefabAsset: {fileID: 0} --- !u!4 &3658030456276907300 stripped Transform: m_CorrespondingSourceObject: {fileID: -5313860892930385167, guid: 5bccc794d486ced4fbedd51a7ad6a12b, type: 3} m_PrefabInstance: {fileID: 325016726498095061} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6387583956562757799 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1706086765012306492} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.3272829 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.09974547 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.024923144 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.7066675 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.024924124 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.70666736 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_Name + value: G_emoji + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, type: 3} +--- !u!4 &6858974254605872972 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + m_PrefabInstance: {fileID: 6387583956562757799} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7590174500611143296 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00019_G00018.prefab b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00019_G00018.prefab index 3c56f9113a1..0a0652e448d 100644 --- a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00019_G00018.prefab +++ b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00019_G00018.prefab @@ -58,7 +58,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 5bccc794d486ced4fbedd51a7ad6a12b, type: 3} propertyPath: m_LocalPosition.x - value: -4.769473 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 5bccc794d486ced4fbedd51a7ad6a12b, type: 3} @@ -68,7 +68,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 5bccc794d486ced4fbedd51a7ad6a12b, type: 3} propertyPath: m_LocalPosition.z - value: -1.7634277 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 5bccc794d486ced4fbedd51a7ad6a12b, type: 3} @@ -124,6 +124,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 1382477688290633193, guid: 5bccc794d486ced4fbedd51a7ad6a12b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5050186345724841365} - targetCorrespondingSourceObject: {fileID: -5313860892930385167, guid: 5bccc794d486ced4fbedd51a7ad6a12b, type: 3} insertIndex: -1 @@ -142,6 +146,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2604781694440510815} m_PrefabAsset: {fileID: 0} +--- !u!4 &3965849400255082678 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1382477688290633193, guid: 5bccc794d486ced4fbedd51a7ad6a12b, + type: 3} + m_PrefabInstance: {fileID: 2604781694440510815} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3600460805584844853 PrefabInstance: m_ObjectHideFlags: 0 @@ -216,3 +226,97 @@ Transform: type: 3} m_PrefabInstance: {fileID: 3600460805584844853} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4728608926953138814 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3965849400255082678} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.3272829 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.09974547 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.024923144 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.7066675 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.024924124 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.70666736 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_Name + value: G_emoji + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, type: 3} +--- !u!4 &5050186345724841365 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + m_PrefabInstance: {fileID: 4728608926953138814} + m_PrefabAsset: {fileID: 0} diff --git a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00021_G00022.prefab b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00021_G00022.prefab index dc5705a3bb0..2bb59aa7952 100644 --- a/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00021_G00022.prefab +++ b/ProjectNLD/Assets/Art/Character/Prefabs/Enemy/P_E00021_G00022.prefab @@ -124,6 +124,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8765025302421469380, guid: 3422f5660198754478f23c5c0498a9cb, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2503483513971844614} - targetCorrespondingSourceObject: {fileID: -5313860892930385167, guid: 3422f5660198754478f23c5c0498a9cb, type: 3} insertIndex: -1 @@ -142,6 +146,106 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1798361672839151755} m_PrefabAsset: {fileID: 0} +--- !u!4 &7013987512027002959 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8765025302421469380, guid: 3422f5660198754478f23c5c0498a9cb, + type: 3} + m_PrefabInstance: {fileID: 1798361672839151755} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &2680927659582276077 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7013987512027002959} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.9295651 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.09974547 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.024923148 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.7066675 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.024924127 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.70666736 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + propertyPath: m_Name + value: G_emoji + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, type: 3} +--- !u!4 &2503483513971844614 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4ca7c7d64cdf7bb40b387d55552d3b55, + type: 3} + m_PrefabInstance: {fileID: 2680927659582276077} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6801287384814172160 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/ProjectNLD/Assets/Art/Character/Prefabs/Structure/P_S00015_HY_01.prefab b/ProjectNLD/Assets/Art/Character/Prefabs/Structure/P_S00015_HY_01.prefab new file mode 100644 index 00000000000..6c0122fbbdd --- /dev/null +++ b/ProjectNLD/Assets/Art/Character/Prefabs/Structure/P_S00015_HY_01.prefab @@ -0,0 +1,108 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3919779227249793456 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6403290196949842770} + m_Layer: 0 + m_Name: P_S00015_HY_01 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6403290196949842770 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3919779227249793456} + 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: 211299856355453814} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &388445797015162013 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6403290196949842770} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 1ed9d62254b433548858000a60c58c05, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1ed9d62254b433548858000a60c58c05, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1ed9d62254b433548858000a60c58c05, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1ed9d62254b433548858000a60c58c05, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1ed9d62254b433548858000a60c58c05, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1ed9d62254b433548858000a60c58c05, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1ed9d62254b433548858000a60c58c05, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1ed9d62254b433548858000a60c58c05, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1ed9d62254b433548858000a60c58c05, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1ed9d62254b433548858000a60c58c05, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 1ed9d62254b433548858000a60c58c05, + type: 3} + propertyPath: m_Name + value: S00015_HY + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1ed9d62254b433548858000a60c58c05, type: 3} +--- !u!4 &211299856355453814 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 1ed9d62254b433548858000a60c58c05, + type: 3} + m_PrefabInstance: {fileID: 388445797015162013} + m_PrefabAsset: {fileID: 0} diff --git a/ProjectNLD/Assets/Art/Character/Prefabs/Structure/P_S00015_HY_01.prefab.meta b/ProjectNLD/Assets/Art/Character/Prefabs/Structure/P_S00015_HY_01.prefab.meta new file mode 100644 index 00000000000..513a718b481 --- /dev/null +++ b/ProjectNLD/Assets/Art/Character/Prefabs/Structure/P_S00015_HY_01.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9f7b71ee1f750ef4c99a469925de284e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectNLD/Assets/Art/UI/Prefab/Story/UIStoryMain.prefab b/ProjectNLD/Assets/Art/UI/Prefab/Story/UIStoryMain.prefab index cd79ce5f12d..d6abcd04c6f 100644 --- a/ProjectNLD/Assets/Art/UI/Prefab/Story/UIStoryMain.prefab +++ b/ProjectNLD/Assets/Art/UI/Prefab/Story/UIStoryMain.prefab @@ -1295,7 +1295,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &7051972693408823226 RectTransform: m_ObjectHideFlags: 0 @@ -4475,7 +4475,7 @@ RectTransform: m_Father: {fileID: 5014326811785617644} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: -18} m_SizeDelta: {x: 35, y: 203} m_Pivot: {x: 0.5, y: 0.5} @@ -4993,7 +4993,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2435750827471002304 RectTransform: m_ObjectHideFlags: 0 @@ -5189,7 +5189,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7896991221781629267 RectTransform: m_ObjectHideFlags: 0 @@ -5390,7 +5390,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &109264313758130537 RectTransform: m_ObjectHideFlags: 0 @@ -6760,9 +6760,9 @@ RectTransform: m_Father: {fileID: 6319488051365112474} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &289031393887604237 CanvasRenderer: diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/Story/UIStoryMainController.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/Story/UIStoryMainController.cs index 037795dee4c..d2303ce3656 100644 --- a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/Story/UIStoryMainController.cs +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/Story/UIStoryMainController.cs @@ -21,9 +21,9 @@ public class UIStoryMainController : UIWindow //UI GameObj ///Auto Gen Start/// public Image Image_TalkBubble; - public Image Image_PlotBG; public Image Image_TalkBG01; public TMP_Text Text_Talk01; + public Image Image_PlotBG; public Image Image_TalkBG02; public Image Image_TalkPic; public TMP_Text Text_Name02; @@ -56,18 +56,28 @@ public class UIStoryMainController : UIWindow private GameObject _uiSelectGo; private GameObject _goTalkLog; //剧情记录页面 private GameObject _goBubble; //气泡框 - private Transform _bubbleRootTrans; //气泡框根节点 + private Transform _bubbleRootTrans; //气泡框根节点 + private GameObject _logItem; //剧情对话记录item + private ScrollView _scrollLog; //剧情对话记录列表 + private GameObject _scrollLogContent; private Dictionary _bubblePool; //不用的对话框对象池 private Dictionary _dispBubblePool; //正在展示的对话框对象池 - + private List _cgPool; //CG图片池 + private bool _isAuto; private bool _isSkipping; private EDOpenChoiceData _openData; //打开对话选项传入Data private int _selectIdx; //剧情分支选择Index - private List _talkLogs; //剧情记录 + private List _talkLogs; //剧情记录 private Dictionary _curBlockTalkDic; //当前每个角色对话内容缓存 - + private string _curBlock2DTalk; //2D模式下对话缓存 + private int _cur2DTalkPlayerId; //2D模式下说话人缓存 + private struct LogData + { + public string name; + public string msg; + } // Use this for initialization public override void OnAwake() @@ -76,14 +86,18 @@ public class UIStoryMainController : UIWindow UIStoryMainBinder.GetComponents(this); _scroll = GetComponent("UISelect/ImageSelect/ScrollView"); _uiSelectGo = FindObj("UISelect"); - _goTalkLog = FindObj("Image_PlotBG/GoTalkLog"); + _goTalkLog = FindObj("GoTalkLog"); _goBubble = FindObj("Image_TalkBubble"); _bubbleRootTrans = transform.Find("UI_Bubbles"); + _logItem = FindObj("UI_TalkItem"); + _scrollLogContent = FindObj("GoTalkLog/Image_ChapterTalkBG/Scroll View/Viewport/Content"); + _scrollLog = GetComponent("GoTalkLog/Image_ChapterTalkBG/Scroll View"); - _talkLogs = new List(); + _talkLogs = new List(); _curBlockTalkDic = new Dictionary(); _dispBubblePool = new Dictionary(); _bubblePool = new Dictionary(); + _cgPool = new List(); BindButtons(); } @@ -150,6 +164,7 @@ public class UIStoryMainController : UIWindow _talkLogs.Clear(); _curBlockTalkDic.Clear(); ReleaseBubbles(); + ReleaseCgImg(); } //创建所有角色的对话框 @@ -311,6 +326,7 @@ public class UIStoryMainController : UIWindow if (StoryManager.instance.uiManager.uiModType == EStoryUIMod.Camera3D) { ShowBubble(talkData); + _talkLogs.Add(new LogData(){name = player.playerName, msg = talkData.talkMsg}); } } @@ -324,7 +340,7 @@ public class UIStoryMainController : UIWindow } - //展示气泡框对话啊 + //展示气泡框对话 private void ShowBubble(EDPlayerTalkData talkData) { var go = GetBubbleObj(talkData.playerId); @@ -332,6 +348,7 @@ public class UIStoryMainController : UIWindow DoEnableBubbleObj(talkData.playerId); } + //获取角色id对应的气泡框对象 private GameObject GetBubbleObj(int playerId) { if (_dispBubblePool.TryGetValue(playerId, out var objDisplay)) @@ -414,5 +431,88 @@ public class UIStoryMainController : UIWindow return null; } + /****** 展示CG图片 ******/ + private void ShowCgImg(Sprite sprite) + { + var temp = Image_TalkPic.gameObject; + var goCgPic = Instantiate(temp, Image_TalkBG02.transform); + goCgPic.transform.position = temp.transform.position; + var imgCg = goCgPic.GetComponent(); + imgCg.sprite = sprite; + goCgPic.SetActive(true); + _cgPool.Add(imgCg); + } + + private void ReleaseCgImg() + { + for (int i = _cgPool.Count; i >= 0; i--) + { + Destroy(_cgPool[i]); + _cgPool.RemoveAt(i); + } + } + + /****** 2D模式对话 *****/ + private void PostTalk2D(int playerId, string content) + { + if (StoryManager.instance.uiManager.uiModType != EStoryUIMod.CameraUI) + { + return; + } + + if (CheckIsSameTalk2D(playerId, content)) + { + return; + } + + ShowTalk2D(playerId, content); + } + + private void ShowTalk2D(int playerId, string content) + { + _cur2DTalkPlayerId = playerId; + _curBlock2DTalk = content; + var player = StoryManager.instance.playerManager.playerDict[playerId]; + Text_Name02.text = player.playerName; + Text_Content02.text = content; + } + + private bool CheckIsSameTalk2D(int playerId, string content) + { + if (playerId != _cur2DTalkPlayerId) + { + return false; + } + return _curBlock2DTalk == content; + } + + /***********/ + + //剧情对话记录 + private void OpenTalkLog() + { + CreateLogScroll(); + _goTalkLog.SetActive(true); + } + + private void CreateLogScroll() + { + if (_scrollLog) + { + CommonUtils.DestoryAllChildGameObject(_scrollLogContent); + } + } + + private void RefreshScrollLog() + { + + } + + private void RefreshLogItem(int index, RectTransform item) + { + var go = item.gameObject; + var txtName = CommonUtils.GetGameObject(go, "TextName"); + } + } diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UI_Interface/UI_InterfaceController.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UI_Interface/UI_InterfaceController.cs index 8a6be0e33dc..5bbe8ecc75a 100644 --- a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UI_Interface/UI_InterfaceController.cs +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UI_Interface/UI_InterfaceController.cs @@ -12,6 +12,8 @@ using UnityEngine.UI; using Button = UnityEngine.UI.Button; using Image = UnityEngine.UI.Image; using System; +using cfg.LevelCfg; +using CriWare; public class UI_InterfaceController : UIWindow { @@ -75,6 +77,9 @@ public class UI_InterfaceController : UIWindow public RawImage RawImage_Scene; public Button GiftCodeBtn; + + private CriAtomExOutputAnalyzer analyzer; + ///Auto Gen End/// // Use this for initializationf @@ -94,6 +99,20 @@ public class UI_InterfaceController : UIWindow GiftCodeBtn = GetComponent