diff --git a/nekoyume/Assets/AddressableAssets/UI/Module/Arena/Join/ArenaJoinSeasonInfoSessionProgressFill.mat b/nekoyume/Assets/AddressableAssets/UI/Module/Arena/Join/ArenaJoinSeasonInfoSessionProgressFill.mat index efe1086d25..589aa8c2da 100644 --- a/nekoyume/Assets/AddressableAssets/UI/Module/Arena/Join/ArenaJoinSeasonInfoSessionProgressFill.mat +++ b/nekoyume/Assets/AddressableAssets/UI/Module/Arena/Join/ArenaJoinSeasonInfoSessionProgressFill.mat @@ -128,7 +128,7 @@ Material: - OffsetUV_ZoomY_1: 1 - PinchUV_Size_1: 0.25 - PixelSnap: 0 - - PositionUV_X_1: 1.15 + - PositionUV_X_1: 0.5322417 - PositionUV_Y_1: 0 - ResizeUV_X_1: -1 - ResizeUV_X_2: 0 diff --git a/nekoyume/Assets/AddressableAssetsData/link.xml b/nekoyume/Assets/AddressableAssetsData/link.xml new file mode 100644 index 0000000000..91707193b7 --- /dev/null +++ b/nekoyume/Assets/AddressableAssetsData/link.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/nekoyume/Assets/AddressableAssetsData/link.xml.meta b/nekoyume/Assets/AddressableAssetsData/link.xml.meta new file mode 100644 index 0000000000..af2e1fba6a --- /dev/null +++ b/nekoyume/Assets/AddressableAssetsData/link.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ec221d43d7087b949a702d4aa91260d5 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Resources/PerformanceTestRunInfo.json b/nekoyume/Assets/Resources/PerformanceTestRunInfo.json new file mode 100644 index 0000000000..dc5ce394a1 --- /dev/null +++ b/nekoyume/Assets/Resources/PerformanceTestRunInfo.json @@ -0,0 +1,125 @@ +{ + "TestSuite": "", + "Date": 1667921792956, + "Player": { + "Development": false, + "ScreenWidth": 0, + "ScreenHeight": 0, + "ScreenRefreshRate": 0, + "Fullscreen": false, + "Vsync": 0, + "AntiAliasing": 0, + "Batchmode": false, + "RenderThreadingMode": "MultiThreaded", + "GpuSkinning": false, + "Platform": "", + "ColorSpace": "", + "AnisotropicFiltering": "", + "BlendWeights": "", + "GraphicsApi": "", + "ScriptingBackend": "Mono2x", + "AndroidTargetSdkVersion": "AndroidApiLevelAuto", + "AndroidBuildSystem": "Gradle", + "BuildTarget": "StandaloneWindows64", + "StereoRenderingPath": "MultiPass" + }, + "Hardware": { + "OperatingSystem": "", + "DeviceModel": "", + "DeviceName": "", + "ProcessorType": "", + "ProcessorCount": 0, + "GraphicsDeviceName": "", + "SystemMemorySizeMB": 0 + }, + "Editor": { + "Version": "2021.3.5f1", + "Branch": "2021.3/staging", + "Changeset": "40eb3a945986", + "Date": 1655190469 + }, + "Dependencies": [ + "com.brunomikoski.animationsequencer@0.1.6", + "com.coffee.softmask-for-ugui@1.0.0-preview.14", + "com.coffee.ui-effect@4.0.0-preview.9", + "com.coffee.ui-particle@3.3.0", + "com.cysharp.unitask@2.2.5", + "com.demigiant.dotween@1.2.42", + "com.elringus.spriteglow@1.8.0", + "com.laicasaane.texttyper@3.1.0", + "com.mixpanel.unity@3.0.1", + "com.neuecc.unirx@7.1.0", + "com.unity.2d.sprite@1.0.0", + "com.unity.addressables@1.19.19", + "com.unity.analytics@3.6.12", + "com.unity.cinemachine@2.8.6", + "com.unity.collab-proxy@1.15.18", + "com.unity.entities@0.51.1-preview.21", + "com.unity.ide.rider@3.0.15", + "com.unity.ide.visualstudio@2.0.16", + "com.unity.ide.vscode@1.2.5", + "com.unity.mathematics@1.2.6", + "com.unity.memoryprofiler@0.7.0-preview.2", + "com.unity.postprocessing@3.2.2", + "com.unity.render-pipelines.universal@12.1.7", + "com.unity.test-framework@1.1.31", + "com.unity.textmeshpro@3.0.6", + "com.unity.timeline@1.6.4", + "com.unity.ugui@1.0.0", + "com.unity.uiextensions@2.2.7", + "io.sentry.unity@0.23.1", + "com.unity.modules.ai@1.0.0", + "com.unity.modules.androidjni@1.0.0", + "com.unity.modules.animation@1.0.0", + "com.unity.modules.assetbundle@1.0.0", + "com.unity.modules.audio@1.0.0", + "com.unity.modules.cloth@1.0.0", + "com.unity.modules.director@1.0.0", + "com.unity.modules.imageconversion@1.0.0", + "com.unity.modules.imgui@1.0.0", + "com.unity.modules.jsonserialize@1.0.0", + "com.unity.modules.particlesystem@1.0.0", + "com.unity.modules.physics@1.0.0", + "com.unity.modules.physics2d@1.0.0", + "com.unity.modules.screencapture@1.0.0", + "com.unity.modules.terrain@1.0.0", + "com.unity.modules.terrainphysics@1.0.0", + "com.unity.modules.tilemap@1.0.0", + "com.unity.modules.ui@1.0.0", + "com.unity.modules.uielements@1.0.0", + "com.unity.modules.umbra@1.0.0", + "com.unity.modules.unityanalytics@1.0.0", + "com.unity.modules.unitywebrequest@1.0.0", + "com.unity.modules.unitywebrequestassetbundle@1.0.0", + "com.unity.modules.unitywebrequestaudio@1.0.0", + "com.unity.modules.unitywebrequesttexture@1.0.0", + "com.unity.modules.unitywebrequestwww@1.0.0", + "com.unity.modules.vehicles@1.0.0", + "com.unity.modules.video@1.0.0", + "com.unity.modules.vr@1.0.0", + "com.unity.modules.wind@1.0.0", + "com.unity.modules.xr@1.0.0", + "com.unity.modules.subsystems@1.0.0", + "com.unity.modules.uielementsnative@1.0.0", + "com.unity.ext.nunit@1.0.6", + "com.unity.render-pipelines.core@12.1.7", + "com.unity.shadergraph@12.1.7", + "com.unity.editorcoroutines@1.0.0", + "com.unity.burst@1.6.6", + "com.unity.properties@1.7.0-preview", + "com.unity.properties.ui@1.7.0-preview", + "com.unity.serialization@1.7.0-preview.1", + "com.unity.collections@1.4.0", + "com.unity.jobs@0.70.0-preview.7", + "com.unity.test-framework.performance@2.8.0-preview", + "com.unity.scriptablebuildpipeline@1.20.1", + "com.unity.platforms@0.51.1-preview.21", + "com.unity.roslyn@0.2.2-preview", + "com.unity.profiling.core@1.0.2", + "com.unity.services.core@1.4.0", + "com.unity.searcher@4.9.1", + "com.unity.nuget.mono-cecil@1.11.4", + "com.unity.nuget.newtonsoft-json@3.0.2" + ], + "Results": [] +} \ No newline at end of file diff --git a/nekoyume/Assets/Resources/PerformanceTestRunInfo.json.meta b/nekoyume/Assets/Resources/PerformanceTestRunInfo.json.meta new file mode 100644 index 0000000000..41a4d82d0d --- /dev/null +++ b/nekoyume/Assets/Resources/PerformanceTestRunInfo.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d9c9008803912534797eebff39071421 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Resources/UI/Prefabs/UI_PandoraSettingPopup.prefab b/nekoyume/Assets/Resources/UI/Prefabs/UI_PandoraSettingPopup.prefab index e74a0c741f..4f92d94c60 100644 --- a/nekoyume/Assets/Resources/UI/Prefabs/UI_PandoraSettingPopup.prefab +++ b/nekoyume/Assets/Resources/UI/Prefabs/UI_PandoraSettingPopup.prefab @@ -2444,10 +2444,10 @@ MonoBehaviour: m_FillRect: {fileID: 7674687939297130789} m_HandleRect: {fileID: 5485844281425836346} m_Direction: 0 - m_MinValue: 2 - m_MaxValue: 6 + m_MinValue: 4 + m_MaxValue: 10 m_WholeNumbers: 1 - m_Value: 5 + m_Value: 4 m_OnValueChanged: m_PersistentCalls: m_Calls: diff --git a/nekoyume/Assets/StreamingAssets/UnityServicesProjectConfiguration.json b/nekoyume/Assets/StreamingAssets/UnityServicesProjectConfiguration.json new file mode 100644 index 0000000000..34b3a44128 --- /dev/null +++ b/nekoyume/Assets/StreamingAssets/UnityServicesProjectConfiguration.json @@ -0,0 +1 @@ +{"Keys":["com.unity.services.core.version"],"Values":[{"m_Value":"1.4.0","m_IsReadOnly":true}]} \ No newline at end of file diff --git a/nekoyume/Assets/StreamingAssets/UnityServicesProjectConfiguration.json.meta b/nekoyume/Assets/StreamingAssets/UnityServicesProjectConfiguration.json.meta new file mode 100644 index 0000000000..a8ca45c155 --- /dev/null +++ b/nekoyume/Assets/StreamingAssets/UnityServicesProjectConfiguration.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4286b23aaaf68b7458980d83807b0952 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/_Scenes/GameRun.unity b/nekoyume/Assets/_Scenes/GameRun.unity index 80340f5185..5fa76cc326 100644 --- a/nekoyume/Assets/_Scenes/GameRun.unity +++ b/nekoyume/Assets/_Scenes/GameRun.unity @@ -5639,7 +5639,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1367334645} + m_TransformParent: {fileID: 3498570323729140630} m_Modifications: - target: {fileID: 5999522416203351620, guid: 0d51d7e175277374ea7da21affbd00c4, type: 3} @@ -5713,6 +5713,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0d51d7e175277374ea7da21affbd00c4, type: 3} +--- !u!4 &19045921 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5999522416203351620, guid: 0d51d7e175277374ea7da21affbd00c4, + type: 3} + m_PrefabInstance: {fileID: 19045920} + m_PrefabAsset: {fileID: 0} --- !u!1001 &21297065 PrefabInstance: m_ObjectHideFlags: 0 @@ -8816,7 +8822,7 @@ MonoBehaviour: materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: Idle - loop: 0 + loop: 1 timeScale: 1 --- !u!23 &176615529 MeshRenderer: @@ -9524,7 +9530,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 176615527} - m_Father: {fileID: 1611701682} + m_Father: {fileID: 3498570323986876627} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!58 &246048530 @@ -9537,7 +9543,7 @@ CircleCollider2D: m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: 0.24} @@ -10643,6 +10649,56 @@ Transform: m_Father: {fileID: 117842994} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &323375007 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 323375008} + - component: {fileID: 323375009} + m_Layer: 10 + m_Name: Missile + m_TagString: Missile + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &323375008 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 323375007} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 10.015, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 379330317} + - {fileID: 1850504232} + m_Father: {fileID: 773790994} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &323375009 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 323375007} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a6352ff1bb3d884eb448a2433ff0214, type: 3} + m_Name: + m_EditorClassIdentifier: + MoveAxis: {x: 1, y: 0} + MoveSpeed: -4 + TimeScale: 1 + EndPosition: -3000 --- !u!1 &325057395 GameObject: m_ObjectHideFlags: 0 @@ -10753,7 +10809,7 @@ Transform: - {fileID: 165838326} - {fileID: 950347510} m_Father: {fileID: 1410049530} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &325057397 SpriteRenderer: @@ -11516,6 +11572,127 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!1 &379330316 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 379330317} + - component: {fileID: 379330320} + - component: {fileID: 379330319} + - component: {fileID: 379330318} + m_Layer: 0 + m_Name: New SkeletonAnimation + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &379330317 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 379330316} + m_LocalRotation: {x: -0, y: -0, z: 0.47843453, w: 0.8781232} + m_LocalPosition: {x: 0.113, y: -0.301, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 323375008} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 57.166} +--- !u!114 &379330318 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 379330316} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonDataAsset: {fileID: 11400000, guid: 7184d595554d7e64690a4c77aa9ddb31, type: 2} + initialSkinName: + initialFlipX: 0 + initialFlipY: 0 + updateWhenInvisible: 3 + separatorSlotNames: [] + zSpacing: 0 + useClipping: 1 + immutableTriangles: 0 + pmaVertexColors: 1 + clearStateOnDisable: 0 + tintBlack: 0 + singleSubmesh: 0 + fixDrawOrder: 0 + addNormals: 0 + calculateTangents: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] + disableRenderingOnOverride: 1 + _animationName: + loop: 0 + timeScale: 1 +--- !u!23 &379330319 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 379330316} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 037542660d9327f4ea5b5251366ce494, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -385277771 + m_SortingLayer: 3 + m_SortingOrder: 10 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &379330320 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 379330316} + m_Mesh: {fileID: 0} --- !u!1 &387341380 GameObject: m_ObjectHideFlags: 0 @@ -16620,7 +16797,7 @@ Transform: - {fileID: 1727314032} - {fileID: 1046549670} m_Father: {fileID: 1410049530} - m_RootOrder: 8 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!50 &409502422 Rigidbody2D: @@ -18091,7 +18268,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1611701682} + m_TransformParent: {fileID: 3498570323986876627} m_Modifications: - target: {fileID: 891663119316593692, guid: c3725fdb1eff92e40b2217b546784d41, type: 3} @@ -18165,6 +18342,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c3725fdb1eff92e40b2217b546784d41, type: 3} +--- !u!4 &510949684 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 891663119316593692, guid: c3725fdb1eff92e40b2217b546784d41, + type: 3} + m_PrefabInstance: {fileID: 510949683} + m_PrefabAsset: {fileID: 0} --- !u!1001 &515929954 PrefabInstance: m_ObjectHideFlags: 0 @@ -18270,7 +18453,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2052602402} - m_Father: {fileID: 1367334645} + m_Father: {fileID: 3498570323729140630} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!58 &516021712 @@ -19706,7 +19889,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 899210711} - m_Father: {fileID: 1611701682} + m_Father: {fileID: 3498570323986876627} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!58 &631720200 @@ -19719,7 +19902,7 @@ CircleCollider2D: m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: 0.24} @@ -22029,7 +22212,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1367334645} + m_TransformParent: {fileID: 3498570323729140630} m_Modifications: - target: {fileID: 318686756433621673, guid: e1396a03de06b9b4795dd931353a812b, type: 3} @@ -22103,6 +22286,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e1396a03de06b9b4795dd931353a812b, type: 3} +--- !u!4 &751595794 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6537192236742754607, guid: e1396a03de06b9b4795dd931353a812b, + type: 3} + m_PrefabInstance: {fileID: 751595793} + m_PrefabAsset: {fileID: 0} --- !u!1 &752092523 GameObject: m_ObjectHideFlags: 0 @@ -22316,6 +22505,56 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &773790993 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 773790994} + - component: {fileID: 773790995} + m_Layer: 10 + m_Name: EnemyRocket + m_TagString: Untagged + m_Icon: {fileID: -5487077368411116049, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &773790994 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 773790993} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -5, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1374579271} + - {fileID: 1856065331} + - {fileID: 323375008} + m_Father: {fileID: 1410049530} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &773790995 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 773790993} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9c7a4ecedddc6424fa6e3dc2b1ce8096, type: 3} + m_Name: + m_EditorClassIdentifier: + WarningSprite: {fileID: 1856065331} + Missile: {fileID: 323375007} + runnerPlayer: {fileID: 1118680951} --- !u!1001 &779325105 PrefabInstance: m_ObjectHideFlags: 0 @@ -24677,7 +24916,7 @@ MonoBehaviour: materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: Idle - loop: 0 + loop: 1 timeScale: 1 --- !u!23 &899210713 MeshRenderer: @@ -26855,7 +27094,7 @@ PrefabInstance: - target: {fileID: 6078864021209297426, guid: 12614d5f92d78084088994fd62636f92, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 6078864021209297426, guid: 12614d5f92d78084088994fd62636f92, type: 3} @@ -27612,7 +27851,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1367334645} + m_TransformParent: {fileID: 3498570323729140630} m_Modifications: - target: {fileID: 318686756433621673, guid: e1396a03de06b9b4795dd931353a812b, type: 3} @@ -27686,6 +27925,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e1396a03de06b9b4795dd931353a812b, type: 3} +--- !u!4 &1094182306 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6537192236742754607, guid: e1396a03de06b9b4795dd931353a812b, + type: 3} + m_PrefabInstance: {fileID: 1094182305} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1097257487 PrefabInstance: m_ObjectHideFlags: 0 @@ -28019,7 +28264,7 @@ MonoBehaviour: TimeScale: 1 runner: 1 WalkingSound: {fileID: 1118680955} - SkeletonAnimation: {fileID: 9055066952934718787} + RunnerSkeletonAnimation: {fileID: 9055066952934718787} Animator: {fileID: 3578581978799384308} jetpackFire: {fileID: 16249089} --- !u!50 &1118680953 @@ -28375,7 +28620,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1367334645} + m_TransformParent: {fileID: 3498570323729140630} m_Modifications: - target: {fileID: 891663119316593692, guid: c3725fdb1eff92e40b2217b546784d41, type: 3} @@ -28449,6 +28694,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c3725fdb1eff92e40b2217b546784d41, type: 3} +--- !u!4 &1144626126 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 891663119316593692, guid: c3725fdb1eff92e40b2217b546784d41, + type: 3} + m_PrefabInstance: {fileID: 1144626125} + m_PrefabAsset: {fileID: 0} --- !u!1 &1148149372 GameObject: m_ObjectHideFlags: 0 @@ -29271,7 +29522,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1753191822} - m_Father: {fileID: 1367334645} + m_Father: {fileID: 3498570323729140630} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!58 &1205366282 @@ -31665,91 +31916,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1366975766} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1367334644 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1410049530} - m_Modifications: - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_LocalPosition.x - value: -5 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251299, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_Name - value: Enemy02 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251299, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251299, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_TagString - value: Untagged - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a14443ea5e3b42e4fb2bbf55147e1dce, type: 3} ---- !u!4 &1367334645 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - m_PrefabInstance: {fileID: 1367334644} - m_PrefabAsset: {fileID: 0} --- !u!1 &1367579873 GameObject: m_ObjectHideFlags: 0 @@ -31860,6 +32026,37 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1368209533} m_PrefabAsset: {fileID: 0} +--- !u!1 &1374579270 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1374579271} + m_Layer: 10 + m_Name: EndWave + m_TagString: Untagged + m_Icon: {fileID: -5938655980376293919, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1374579271 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1374579270} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 10, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 773790994} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1376055205 PrefabInstance: m_ObjectHideFlags: 0 @@ -33035,13 +33232,13 @@ Transform: m_Children: - {fileID: 1367579874} - {fileID: 1118680951} - - {fileID: 8997592758339879399} + - {fileID: 409502421} - {fileID: 569940237} - - {fileID: 1611701682} - - {fileID: 1367334645} + - {fileID: 773790994} + - {fileID: 3498570323986876627} + - {fileID: 3498570323729140630} - {fileID: 325057396} - {fileID: 1521394830} - - {fileID: 409502421} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -33057,6 +33254,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8fef17eeaa5bc14782fe3c22fa6b9bf, type: 3} m_Name: m_EditorClassIdentifier: + player: {fileID: 1118680952} BgArray: - {fileID: 573571914} - {fileID: 1541192778} @@ -33068,14 +33266,13 @@ MonoBehaviour: - {fileID: 1955260443} - {fileID: 8389403} enemiesArray: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} + - {fileID: 773790994} + - {fileID: 3498570323986876627} + - {fileID: 3498570323729140630} CoinsArray: - {fileID: 569940237} - {fileID: 325057396} - {fileID: 1521394830} - player: {fileID: 1118680952} runnerBoss: {fileID: 409502421} SelectedBooster: {fileID: 0} LevelSpeed: 5 @@ -34806,7 +35003,7 @@ Transform: - {fileID: 1889565944} - {fileID: 1232432707} m_Father: {fileID: 1410049530} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1521394831 SpriteRenderer: @@ -36986,91 +37183,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1608075563} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1611701681 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1410049530} - m_Modifications: - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_LocalPosition.x - value: -5 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251299, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_Name - value: Enemy01 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251299, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251299, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_TagString - value: Untagged - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a14443ea5e3b42e4fb2bbf55147e1dce, type: 3} ---- !u!4 &1611701682 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - m_PrefabInstance: {fileID: 1611701681} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1612035387 PrefabInstance: m_ObjectHideFlags: 0 @@ -41383,6 +41495,90 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!1 &1850504231 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1850504232} + - component: {fileID: 1850504233} + m_Layer: 10 + m_Name: Missile (1) + m_TagString: Missile + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1850504232 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1850504231} + m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.06, y: 0.06, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 323375008} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} +--- !u!212 &1850504233 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1850504231} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -385277771 + m_SortingLayer: 3 + m_SortingOrder: 10 + m_Sprite: {fileID: 21300000, guid: 6a5d43547bb83f5408160f8480e3111b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1001 &1851009885 PrefabInstance: m_ObjectHideFlags: 0 @@ -41489,6 +41685,187 @@ Transform: m_Father: {fileID: 573571914} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1856065330 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1856065331} + - component: {fileID: 1856065332} + - component: {fileID: 1856065333} + m_Layer: 10 + m_Name: Warning + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1856065331 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1856065330} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 8, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 773790994} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1856065332 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1856065330} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -385277771 + m_SortingLayer: 3 + m_SortingOrder: 10 + m_Sprite: {fileID: 21300000, guid: 1a8824af3752c4de0988621cbc3e5123, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!82 &1856065333 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1856065330} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 78658ebf8697e8f4197f723a96b15835, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &1856538627 GameObject: m_ObjectHideFlags: 0 @@ -886097,6 +886474,81 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} +--- !u!4 &3498570323729140630 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3498570323729140631} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -5, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5499095106404020059} + - {fileID: 516021711} + - {fileID: 1205366281} + - {fileID: 1144626126} + - {fileID: 1094182306} + - {fileID: 751595794} + - {fileID: 19045921} + m_Father: {fileID: 1410049530} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3498570323729140631 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3498570323729140630} + - component: {fileID: 6925887882076601698} + m_Layer: 10 + m_Name: Enemy02 + m_TagString: Untagged + m_Icon: {fileID: -5487077368411116049, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!1 &3498570323986876626 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3498570323986876627} + - component: {fileID: 6925887881251978791} + m_Layer: 10 + m_Name: Enemy01 + m_TagString: Untagged + m_Icon: {fileID: -5487077368411116049, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &3498570323986876627 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3498570323986876626} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -5, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5499095106116103198} + - {fileID: 631720199} + - {fileID: 246048529} + - {fileID: 510949684} + m_Father: {fileID: 1410049530} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3499555270754858612 MonoBehaviour: m_ObjectHideFlags: 0 @@ -900697,7 +901149,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6264885815477564574} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 31d31fa84aca402e91f399864e10ad55, type: 3} m_Name: @@ -1341381,75 +1341833,68 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1001 &5499095106963068037 -PrefabInstance: +--- !u!1 &5499095106116103197 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1410049530} - m_Modifications: - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_LocalPosition.x - value: -5 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3498570322375251299, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - propertyPath: m_Name - value: Wave - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a14443ea5e3b42e4fb2bbf55147e1dce, type: 3} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5499095106116103198} + m_Layer: 10 + m_Name: EndWave + m_TagString: Untagged + m_Icon: {fileID: -5938655980376293919, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5499095106116103198 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5499095106116103197} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 10, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3498570323986876627} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5499095106404020056 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5499095106404020059} + m_Layer: 10 + m_Name: EndWave + m_TagString: Untagged + m_Icon: {fileID: -5938655980376293919, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5499095106404020059 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5499095106404020056} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 10, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3498570323729140630} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!58 &5501185830769180984 CircleCollider2D: m_ObjectHideFlags: 0 @@ -1719265,6 +1719710,38 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!114 &6925887881251978791 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3498570323986876626} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a6352ff1bb3d884eb448a2433ff0214, type: 3} + m_Name: + m_EditorClassIdentifier: + MoveAxis: {x: 1, y: 0} + MoveSpeed: -2 + TimeScale: 1 + EndPosition: -3000 +--- !u!114 &6925887882076601698 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3498570323729140631} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a6352ff1bb3d884eb448a2433ff0214, type: 3} + m_Name: + m_EditorClassIdentifier: + MoveAxis: {x: 1, y: 0} + MoveSpeed: -2 + TimeScale: 1 + EndPosition: -3000 --- !u!114 &6926298330453642020 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2106921,12 +2107398,6 @@ MonoBehaviour: - {fileID: 21300000, guid: f2d96fdfdfcab6547811339663490b0e, type: 3} - {fileID: 21300000, guid: b5f0eb7b781b5e44ab740ff5a8c2764d, type: 3} - {fileID: 21300000, guid: b82cd9ef4307d8d42af5128c53b35a20, type: 3} ---- !u!4 &8997592758339879399 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3498570322375251298, guid: a14443ea5e3b42e4fb2bbf55147e1dce, - type: 3} - m_PrefabInstance: {fileID: 5499095106963068037} - m_PrefabAsset: {fileID: 0} --- !u!58 &8997727994322566813 CircleCollider2D: m_ObjectHideFlags: 0 diff --git a/nekoyume/Assets/_Scripts/PandoraBox/Scripts/PandoraMaster.cs b/nekoyume/Assets/_Scripts/PandoraBox/Scripts/PandoraMaster.cs index 1060f775db..85f5dbaa68 100644 --- a/nekoyume/Assets/_Scripts/PandoraBox/Scripts/PandoraMaster.cs +++ b/nekoyume/Assets/_Scripts/PandoraBox/Scripts/PandoraMaster.cs @@ -19,8 +19,8 @@ public class PandoraMaster : MonoBehaviour public static PandoraMaster Instance; //Unsaved Reg Settings - public static string OriginalVersionId = "v100311"; - public static string VersionId = "010071A"; + public static string OriginalVersionId = "v100321"; + public static string VersionId = "010071"; //Pandora Database diff --git a/nekoyume/Assets/_Scripts/PandoraBox/_Runner/Audio/missile_warning.wav b/nekoyume/Assets/_Scripts/PandoraBox/_Runner/Audio/missile_warning.wav new file mode 100644 index 0000000000..258208f6da Binary files /dev/null and b/nekoyume/Assets/_Scripts/PandoraBox/_Runner/Audio/missile_warning.wav differ diff --git a/nekoyume/Assets/_Scripts/PandoraBox/_Runner/Audio/missile_warning.wav.meta b/nekoyume/Assets/_Scripts/PandoraBox/_Runner/Audio/missile_warning.wav.meta new file mode 100644 index 0000000000..1bdc55b57e --- /dev/null +++ b/nekoyume/Assets/_Scripts/PandoraBox/_Runner/Audio/missile_warning.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 78658ebf8697e8f4197f723a96b15835 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/_Scripts/PandoraBox/_Runner/Scripts/PandoraRunner.cs b/nekoyume/Assets/_Scripts/PandoraBox/_Runner/Scripts/PandoraRunner.cs index 1bde31b9d5..fb7e97397b 100644 --- a/nekoyume/Assets/_Scripts/PandoraBox/_Runner/Scripts/PandoraRunner.cs +++ b/nekoyume/Assets/_Scripts/PandoraBox/_Runner/Scripts/PandoraRunner.cs @@ -20,15 +20,15 @@ namespace Nekoyume.PandoraBox public class PandoraRunner : MonoBehaviour { public enum RunnerState { Start, Play, Die, Hit, Info, Pause } + public RunnerController player; [SerializeField] Transform[] BgArray; [SerializeField] Transform[] enemiesArray; [SerializeField] Transform[] CoinsArray; - [SerializeField] RunnerController player; + [SerializeField] Transform runnerBoss; //booster public BoosterSlot SelectedBooster = null; - int scoreDistance; int scoreCoins; int life; @@ -60,7 +60,7 @@ private void Start() //Login into playfab PlayFabClientAPI.LoginWithCustomID(new LoginWithCustomIDRequest { - CustomId = "0x1012041FF2254f43d0a938aDF89c3f11867A2A58", + CustomId = "0x46528E7DEdaC16951bDccb55B20303AB0c729679", CreateAccount = true, InfoRequestParameters = new GetPlayerCombinedInfoRequestParams { GetPlayerProfile = true } }, @@ -140,6 +140,8 @@ void InitilizeGame() //reset boss position player.transform.position = new Vector2(-4.185f, -1.11f); runnerBoss.position = new Vector2(-6.463f, -1.11f); + player.gameObject.SetActive(true); + runnerBoss.gameObject.SetActive(true); SelectedBooster = null; @@ -150,11 +152,11 @@ IEnumerator PrepareGame() { //intro animation player.WalkingSound.enabled = true; - float learp = 0; - while (learp < 1) + //float learp = 0; + while (player.transform.position.x < 1) { - learp += Time.deltaTime / 2; - yield return new WaitForSeconds(0); + //learp += Time.deltaTime / 2; + yield return new WaitForSeconds(0.02f); player.transform.position += new Vector3(0.04f, 0); runnerBoss.position += new Vector3(0.04f, 0); } @@ -163,7 +165,7 @@ IEnumerator PrepareGame() RunnerUI.Show(); yield return StartCoroutine(RunnerUI.ShowBoosterSelection()); //Widget.Find() - runnerBoss.GetComponent().PlayOneShot(runnerBoss.GetComponent().clip); + //runnerBoss.GetComponent().PlayOneShot(runnerBoss.GetComponent().clip); //prepare start could function object FuncParam = new { booster = "None" }; @@ -244,12 +246,10 @@ void OnStartSuccess(ExecuteCloudScriptResult result) IEnumerator FinishStartAnimation(bool isBoosted) { - float learp = 0; runnerBoss.GetComponent().PlayOneShot(runnerBoss.GetComponent().clip); - while (learp < 1) + while (player.transform.position.x > -2) { - learp += Time.deltaTime / 2; - yield return new WaitForSeconds(0); + yield return new WaitForSeconds(0.02f); player.transform.position -= new Vector3(0.025f, 0); runnerBoss.position -= new Vector3(0.04f, 0); } @@ -340,34 +340,37 @@ IEnumerator IncreaseSpeed() IEnumerator RocketSpawn() { - //while (true) - //{ - // yield return new WaitForSeconds(Random.Range(5f, 10f) / LevelSpeed); - // if (currentRunnerState == RunnerState.Play) - // { - // //show warning - // bool isVisible = false; - // for (int i = 0; i < 10; i++) - // { - // isVisible = !isVisible; - // warningObj.gameObject.SetActive(isVisible); - // if (isVisible) - // AudioController.instance.PlaySfx(AudioController.SfxCode.Alert); - // yield return new WaitForSeconds(0.2f / LevelSpeed); - // } - // warningObj.gameObject.SetActive(false); - - // if (currentRunnerState == RunnerState.Play) - // { - // Transform currentEnemy = enemiesArray[0]; //rocket enemy - // currentEnemy.GetComponent().anchoredPosition = new Vector2(850, warningObj.anchoredPosition.y); - // currentEnemy.GetComponent().TimeScale = LevelSpeed; - // AudioController.instance.PlaySfx(AudioController.SfxCode.DamageFire); - // currentEnemy.gameObject.SetActive(true); - // } - - // } - //} + while (true) + { + yield return new WaitForSeconds(Random.Range(5f, 10f) / LevelSpeed); + if (currentRunnerState == RunnerState.Play) + { + RunnerMissile currentEnemy = enemiesArray[0].GetComponent(); //rocket enemy + + //show warning + bool isVisible = false; + AudioController.instance.PlaySfx(AudioController.SfxCode.Alert); + + currentEnemy.WarningSprite.gameObject.SetActive(false); + for (int i = 0; i < 10; i++) + { + isVisible = !isVisible; + currentEnemy.WarningSprite.gameObject.SetActive(isVisible); + yield return new WaitForSeconds(0.2f / LevelSpeed); + } + currentEnemy.WarningSprite.gameObject.SetActive(false); + + if (currentRunnerState == RunnerState.Play) + { + + currentEnemy.Missile.transform.position = new Vector3(10, currentEnemy.WarningSprite.transform.position.y); + currentEnemy.GetComponent().TimeScale = LevelSpeed; + AudioController.instance.PlaySfx(AudioController.SfxCode.DamageFire); + currentEnemy.gameObject.SetActive(true); + } + + } + } yield return new WaitForSeconds(0); } @@ -449,7 +452,7 @@ IEnumerator GotRecover(bool DoReduce) item.gameObject.SetActive(false); //player animation - player.SkeletonAnimation.state.TimeScale = 1; + player.RunnerSkeletonAnimation.state.TimeScale = 1; player.LoseAnimation(); yield return new WaitForSeconds(1f); @@ -657,7 +660,7 @@ void SpeedChange() item.GetComponent().TimeScale = LevelSpeed; //player - player.SkeletonAnimation.state.TimeScale = LevelSpeed; + player.RunnerSkeletonAnimation.state.TimeScale = LevelSpeed; player.WalkingSound.pitch = Mathf.Clamp(LevelSpeed, 1, 2); } diff --git a/nekoyume/Assets/_Scripts/PandoraBox/_Runner/Scripts/RunnerController.cs b/nekoyume/Assets/_Scripts/PandoraBox/_Runner/Scripts/RunnerController.cs index e5a8d4edd7..9b48cf65d5 100644 --- a/nekoyume/Assets/_Scripts/PandoraBox/_Runner/Scripts/RunnerController.cs +++ b/nekoyume/Assets/_Scripts/PandoraBox/_Runner/Scripts/RunnerController.cs @@ -19,11 +19,11 @@ public class RunnerController : MonoBehaviour Rigidbody2D rb; int jumpCount; public float TimeScale; - public PandoraRunner.RunnerState runner; + public PandoraRunner.RunnerState runner = PandoraRunner.RunnerState.Start; bool IsSheld = false; public AudioSource WalkingSound; - public SkeletonAnimation SkeletonAnimation; + public SkeletonAnimation RunnerSkeletonAnimation; public Animator Animator; @@ -44,13 +44,13 @@ void Start() WalkingSound = GetComponent(); // Find the slot by name. - var slot = SkeletonAnimation.skeleton.FindSlot("shadow"); + var slot = RunnerSkeletonAnimation.skeleton.FindSlot("shadow"); // Get the attachment by name from the skeleton's skin or default skin. - attachment = SkeletonAnimation.skeleton.GetAttachment(slot.Skeleton.FindSlotIndex("shadow"), "shadow"); + attachment = RunnerSkeletonAnimation.skeleton.GetAttachment(slot.Skeleton.FindSlotIndex("shadow"), "shadow"); // Sets the slot's attachment. slot.Attachment = attachment; - SkeletonAnimation.Skeleton.SetAttachment("weapon", null); + RunnerSkeletonAnimation.Skeleton.SetAttachment("weapon", null); } // Update is called once per frame @@ -78,15 +78,12 @@ void Update() private void OnTriggerEnter2D(Collider2D collision) { - if (collision.CompareTag("Enemy") && runner == PandoraRunner.RunnerState.Play && !IsSheld) + if (( collision.CompareTag("Enemy") || collision.CompareTag("Missile")) && runner == PandoraRunner.RunnerState.Play && !IsSheld) { //Widget.Find().PlayerGotHit(); PandoraRunner.instance.PlayerGotHit(); - if (collision.name == "EnemyRocket") - collision.gameObject.SetActive(false); - else - collision.transform.parent.gameObject.SetActive(false); + collision.transform.parent.gameObject.SetActive(false); //ActionCamera.instance.Shake(); } else if (collision.CompareTag("Coin") && runner == PandoraRunner.RunnerState.Play) @@ -98,7 +95,7 @@ private void OnTriggerEnter2D(Collider2D collision) private void OnCollisionEnter2D(Collision2D collision) { - if (collision.transform.CompareTag("GroundCollider")) + if (collision.transform.CompareTag("GroundCollider") && runner == PandoraRunner.RunnerState.Play) { JetPackIsOn(false); } @@ -138,13 +135,13 @@ void JetPackIsOn(bool isOn) if (isOn) { Animator.Play(nameof(CharacterAnimation.Type.Casting), 0, 0f); - SkeletonAnimation.Skeleton.SetAttachment("shadow", null); + RunnerSkeletonAnimation.Skeleton.SetAttachment("shadow", null); GetComponent().enabled = false; } else { Animator.Play(nameof(CharacterAnimation.Type.Run), 0, 0f); - SkeletonAnimation.Skeleton.SetAttachment("shadow", attachment.Name); + RunnerSkeletonAnimation.Skeleton.SetAttachment("shadow", attachment.Name); GetComponent().enabled = true; } diff --git a/nekoyume/Assets/_Scripts/PandoraBox/_Runner/Scripts/RunnerMissile.cs b/nekoyume/Assets/_Scripts/PandoraBox/_Runner/Scripts/RunnerMissile.cs new file mode 100644 index 0000000000..6122066764 --- /dev/null +++ b/nekoyume/Assets/_Scripts/PandoraBox/_Runner/Scripts/RunnerMissile.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace Nekoyume.PandoraBox +{ + public class RunnerMissile : MonoBehaviour + { + public Transform WarningSprite; + public GameObject Missile; + public Transform runnerPlayer; + + // Update is called once per frame + void Update() + { + WarningSprite.position = new Vector3(WarningSprite.position.x, runnerPlayer.position.y); + } + } +} diff --git a/nekoyume/Assets/_Scripts/PandoraBox/_Runner/Scripts/RunnerMissile.cs.meta b/nekoyume/Assets/_Scripts/PandoraBox/_Runner/Scripts/RunnerMissile.cs.meta new file mode 100644 index 0000000000..7ad2806bf2 --- /dev/null +++ b/nekoyume/Assets/_Scripts/PandoraBox/_Runner/Scripts/RunnerMissile.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9c7a4ecedddc6424fa6e3dc2b1ce8096 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/_Scripts/PandoraBox/_Runner/Scripts/RunnerUnitMovements.cs b/nekoyume/Assets/_Scripts/PandoraBox/_Runner/Scripts/RunnerUnitMovements.cs index a96f5a05b3..3cda66c4ce 100644 --- a/nekoyume/Assets/_Scripts/PandoraBox/_Runner/Scripts/RunnerUnitMovements.cs +++ b/nekoyume/Assets/_Scripts/PandoraBox/_Runner/Scripts/RunnerUnitMovements.cs @@ -24,8 +24,15 @@ private void Update() transform.Translate(MoveAxis * MoveSpeed * TimeScale * Time.deltaTime); //rb.MovePosition(rb.position + (MoveAxis * MoveSpeed * TimeScale * Time.deltaTime)); //rb.velocity = MoveAxis * MoveSpeed * TimeScale * Time.deltaTime * 100; - if (transform.position.x <= -30) - gameObject.SetActive(false); + if (transform.position.x <= -20) + { + if (transform.CompareTag("Missile")) + { + transform.parent.gameObject.SetActive(false); + } + else + gameObject.SetActive(false); + } } } } diff --git a/nekoyume/ProjectSettings/ProjectSettings.asset b/nekoyume/ProjectSettings/ProjectSettings.asset index 66f263ed22..5396e97c37 100644 --- a/nekoyume/ProjectSettings/ProjectSettings.asset +++ b/nekoyume/ProjectSettings/ProjectSettings.asset @@ -626,7 +626,7 @@ PlayerSettings: allowUnsafeCode: 0 useDeterministicCompilation: 1 enableRoslynAnalyzers: 1 - additionalIl2CppArgs: + additionalIl2CppArgs: ' --emit-source-mapping' scriptingRuntimeVersion: 1 gcIncremental: 0 assemblyVersionValidation: 0 diff --git a/nekoyume/ProjectSettings/TagManager.asset b/nekoyume/ProjectSettings/TagManager.asset index 6803cfbb6e..e4e2a7c379 100644 --- a/nekoyume/ProjectSettings/TagManager.asset +++ b/nekoyume/ProjectSettings/TagManager.asset @@ -9,6 +9,7 @@ TagManager: - Effects - Coin - GroundCollider + - Missile layers: - Default - TransparentFX