diff --git a/Gameton-06/Assets/Gameton/Scenes/Empty.unity b/Gameton-06/Assets/Gameton/Scenes/Empty.unity new file mode 100644 index 00000000..4cf8800f --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scenes/Empty.unity @@ -0,0 +1,128 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: [] diff --git a/Gameton-06/Assets/Gameton/Scenes/Empty.unity.meta b/Gameton-06/Assets/Gameton/Scenes/Empty.unity.meta new file mode 100644 index 00000000..b7684077 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scenes/Empty.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8b7fb206503401b4b961e47517f95f2a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Scenes/Ingame.unity b/Gameton-06/Assets/Gameton/Scenes/Ingame.unity new file mode 100644 index 00000000..6783ea1e --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scenes/Ingame.unity @@ -0,0 +1,520 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &265027070 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 265027071} + - component: {fileID: 265027072} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &265027071 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 265027070} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -1, z: 10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1185367604} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &265027072 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 265027070} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &535565208 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 535565209} + m_Layer: 0 + m_Name: ---------------------------- + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &535565209 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 535565208} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.34585175, y: 0.61144084, z: 10.801609} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &718284630 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 718284631} + m_Layer: 0 + m_Name: ---------------------------- + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &718284631 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 718284630} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.34585175, y: 0.61144084, z: 10.801609} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1185367601 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1185367604} + - component: {fileID: 1185367603} + - component: {fileID: 1185367605} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!20 &1185367603 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1185367601} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1185367604 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1185367601} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -7.5013795, y: -11.077314, z: -42.051575} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 265027071} + m_Father: {fileID: 1986734011} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1185367605 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1185367601} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + m_LockStageInInspector: + m_StreamingVersion: 20170927 + m_Priority: 10 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 0} + m_Follow: {fileID: 0} + m_Lens: + FieldOfView: 40 + OrthographicSize: 10 + NearClipPlane: 0.1 + FarClipPlane: 5000 + Dutch: 0 + ModeOverride: 0 + LensShift: {x: 0, y: 0} + GateFit: 2 + FocusDistance: 10 + m_SensorSize: {x: 1, y: 1} + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 + m_ComponentOwner: {fileID: 265027071} +--- !u!1 &1795290567 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1795290568} + m_Layer: 0 + m_Name: TON.InputSytem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1795290568 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1795290567} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.34585175, y: 0.61144084, z: 10.801609} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1986734010 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1986734011} + m_Layer: 0 + m_Name: TON.CameraSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1986734011 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1986734010} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 7.5013795, y: 12.077314, z: 32.051575} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1185367604} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2135657550 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2135657552} + - component: {fileID: 2135657551} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &2135657551 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2135657550} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &2135657552 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2135657550} + serializedVersion: 2 + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1986734011} + - {fileID: 1795290568} + - {fileID: 718284631} + - {fileID: 2135657552} + - {fileID: 535565209} diff --git a/Gameton-06/Assets/Gameton/Scenes/Ingame.unity.meta b/Gameton-06/Assets/Gameton/Scenes/Ingame.unity.meta new file mode 100644 index 00000000..73d928c4 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scenes/Ingame.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: be04c103584269740aed2f66567a86df +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Scenes/SampleScene.unity b/Gameton-06/Assets/Gameton/Scenes/Main.unity similarity index 61% rename from Gameton-06/Assets/Gameton/Scenes/SampleScene.unity rename to Gameton-06/Assets/Gameton/Scenes/Main.unity index 2221b045..ecdb5d7c 100644 --- a/Gameton-06/Assets/Gameton/Scenes/SampleScene.unity +++ b/Gameton-06/Assets/Gameton/Scenes/Main.unity @@ -37,8 +37,7 @@ RenderSettings: m_ReflectionBounces: 1 m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_Sun: {fileID: 0} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -104,7 +103,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,151 +116,114 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &705507993 +--- !u!1 &384034827 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 705507995} - - component: {fileID: 705507994} + - component: {fileID: 384034828} m_Layer: 0 - m_Name: Directional Light + m_Name: TON.Main m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!108 &705507994 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 705507993} - m_Enabled: 1 - serializedVersion: 8 - m_Type: 1 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} - m_Intensity: 1 - m_Range: 10 - m_SpotAngle: 30 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_Lightmapping: 1 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_ShadowRadius: 0 - m_ShadowAngle: 0 ---- !u!4 &705507995 +--- !u!4 &384034828 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 705507993} - m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 0, y: 3, z: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 384034827} + 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_Children: [] + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1410665148} m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &963194225 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1410665147 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 963194228} - - component: {fileID: 963194227} - - component: {fileID: 963194226} + - component: {fileID: 1410665148} + - component: {fileID: 1410665150} + - component: {fileID: 1410665149} m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera + m_Name: EventSystem + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!81 &963194226 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 963194225} - m_Enabled: 1 ---- !u!20 &963194227 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 963194225} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_GateFitMode: 2 - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &963194228 +--- !u!4 &1410665148 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 963194225} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1410665147} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 + m_Father: {fileID: 384034828} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1410665149 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1410665147} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &1410665150 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1410665147} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 384034828} diff --git a/Gameton-06/Assets/Gameton/Scenes/SampleScene.unity.meta b/Gameton-06/Assets/Gameton/Scenes/Main.unity.meta similarity index 100% rename from Gameton-06/Assets/Gameton/Scenes/SampleScene.unity.meta rename to Gameton-06/Assets/Gameton/Scenes/Main.unity.meta diff --git a/Gameton-06/Assets/Gameton/Scenes/Title.unity b/Gameton-06/Assets/Gameton/Scenes/Title.unity new file mode 100644 index 00000000..4cf8800f --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scenes/Title.unity @@ -0,0 +1,128 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: [] diff --git a/Gameton-06/Assets/Gameton/Scenes/Title.unity.meta b/Gameton-06/Assets/Gameton/Scenes/Title.unity.meta new file mode 100644 index 00000000..044e1220 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scenes/Title.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 530f97d61a3226f4aa91e2beb84ca8a6 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Scripts/Common/BootStrapper.cs b/Gameton-06/Assets/Gameton/Scripts/Common/BootStrapper.cs new file mode 100644 index 00000000..f765472c --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Common/BootStrapper.cs @@ -0,0 +1,51 @@ +#if UNITY_EDITOR +using UnityEditor.SceneManagement; +using UnityEngine; +using UnityEngine.SceneManagement; + +namespace TON +{ + /// Main을 타고 실행한 것처러므 씬이 동작되도록 도와주는 도우미 클래스 + public class BootStrapper + { + + private const string BootStrapperMenuPath = "Game One/BootStrapper/Activate Ingame System"; + private static bool IsActivateBootStrapper + { + get => UnityEditor.EditorPrefs.GetBool(BootStrapperMenuPath, false); + set + { + UnityEditor.EditorPrefs.SetBool(BootStrapperMenuPath, value); + UnityEditor.Menu.SetChecked(BootStrapperMenuPath, value); + } + } + + [UnityEditor.MenuItem(BootStrapperMenuPath, false)] + private static void ToggleActivateBootStrapper() + { + IsActivateBootStrapper = !IsActivateBootStrapper; + UnityEditor.Menu.SetChecked(BootStrapperMenuPath, IsActivateBootStrapper); + } + + + [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)] + public static void SystemBoot() + { + Scene activeScene = EditorSceneManager.GetActiveScene(); + if (IsActivateBootStrapper && false == activeScene.name.Equals("Main")) + { + InternalBoot(); + } + } + + private static void InternalBoot() + { + Main.Singleton.Initialize(); + + // TODO : Custom Order After System Load + // UIManager.Show(UIList.IngameUI); + // UIManager.Show(UIList.LogUI); + } + } +} +#endif \ No newline at end of file diff --git a/Gameton-06/Assets/Gameton/Scripts/Common/BootStrapper.cs.meta b/Gameton-06/Assets/Gameton/Scripts/Common/BootStrapper.cs.meta new file mode 100644 index 00000000..33b74306 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Common/BootStrapper.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b3a8bac5825e1be40a3aa098116c4728 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Scripts/Common/InputSystem.cs b/Gameton-06/Assets/Gameton/Scripts/Common/InputSystem.cs new file mode 100644 index 00000000..de9bd273 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Common/InputSystem.cs @@ -0,0 +1,11 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace TON +{ + public class InputSystem : MonoBehaviour + { + + } +} diff --git a/Gameton-06/Assets/Gameton/Scripts/Common/InputSystem.cs.meta b/Gameton-06/Assets/Gameton/Scripts/Common/InputSystem.cs.meta new file mode 100644 index 00000000..cc517a04 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Common/InputSystem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 94c58e7fc0b907b43bbe208a18ca6ded +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Scripts/Common/Main.cs b/Gameton-06/Assets/Gameton/Scripts/Common/Main.cs new file mode 100644 index 00000000..8853520a --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Common/Main.cs @@ -0,0 +1,120 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.SceneManagement; + + +namespace TON +{ + public enum SceneType + { + None, + Empty, + Title, + Ingame, + } + + public class Main : SingletonBase
+ { + private bool isIniaialized = false; + + public void Initialize() + { + if (isIniaialized) + return; + // 게임에 필요한 필수 시스템 초기화 + UIManager.Singleton.Initalize(); + // TODO : GameDataModel.Singleton.Initalize(); + + isIniaialized = true; + } + + private void Start() + { + Initialize(); + +#if UNITY_EDITOR + Scene activeScene = UnityEditor.SceneManagement.EditorSceneManager.GetActiveScene(); + if (activeScene.name.Equals("Main")) + { + ChangeScene(SceneType.Title); + } +#else + ChangeScene(SceneType.Title); +#endif + } + + bool isSceneChangeProgress = false; + SceneBase currentSceneController = null; + SceneType currentSceneType = SceneType.None; + public void ChangeScene(SceneType sceneType, System.Action onSceneChangeCompletedCallback = null) + { + if (isSceneChangeProgress) + return; + + if (currentSceneType == sceneType) + return; + + currentSceneType = sceneType; + switch (sceneType) + { + case SceneType.Title: + StartCoroutine(ChangeScene(onSceneChangeCompletedCallback)); + break; + case SceneType.Ingame: + StartCoroutine(ChangeScene(onSceneChangeCompletedCallback)); + break; + } + } + + private IEnumerator ChangeScene(System.Action onSceneChangeCompletedCallback = null) where T : SceneBase + { + UIManager.Show(UIList.LoadingUI); + yield return new WaitForSeconds(3f); + + isSceneChangeProgress = true; + + // 기존에 불러두었던 씬 컨트롤러(Scene Base)가 있다면, OnEnd를 호출해주고 삭제한다. + if (currentSceneController != null) + { + yield return StartCoroutine(currentSceneController?.OnEnd()); + Destroy(currentSceneController.gameObject); + currentSceneController = null; + } + + // Empty 씬으로 전환을 먼저 한다 + AsyncOperation emptySceneLoad = SceneManager.LoadSceneAsync("Empty", LoadSceneMode.Single); + while (!emptySceneLoad.isDone) + { + yield return null; + } + + // 새로운 씬 컨트롤러를 생성한다. + GameObject newSceneController = new GameObject(typeof(T).Name); + newSceneController.transform.SetParent(transform); + currentSceneController = newSceneController.AddComponent(); + yield return StartCoroutine(currentSceneController.OnStart()); + + // 씬 전환을 종료했다고 플래그 값을 변경한다. + isSceneChangeProgress = false; + + // 씬 전환 후 - 콜백 함수를 호출해준다. + onSceneChangeCompletedCallback?.Invoke(); + UIManager.Hide(UIList.LoadingUI); + + } + + internal void SystemQuit() + { + // TODO: 게임 종료 전 처리할 것들을 추가 + + // 게임 종료 +#if UNITY_EDITOR + UnityEditor.EditorApplication.isPlaying = false; +#else + Application.Quit(); +#endif + + } + } +} diff --git a/Gameton-06/Assets/Gameton/Scripts/Common/Main.cs.meta b/Gameton-06/Assets/Gameton/Scripts/Common/Main.cs.meta new file mode 100644 index 00000000..ed0bc056 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Common/Main.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 364865c88d1f27e45b5697a007bcba78 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Scripts/Common/SceneBase.cs b/Gameton-06/Assets/Gameton/Scripts/Common/SceneBase.cs new file mode 100644 index 00000000..343d50dd --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Common/SceneBase.cs @@ -0,0 +1,13 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace TON +{ + public abstract class SceneBase : MonoBehaviour + { + public abstract IEnumerator OnStart(); + public abstract IEnumerator OnEnd(); + + } +} diff --git a/Gameton-06/Assets/Gameton/Scripts/Common/SceneBase.cs.meta b/Gameton-06/Assets/Gameton/Scripts/Common/SceneBase.cs.meta new file mode 100644 index 00000000..8e3cbf7e --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Common/SceneBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c6b8a25fe16551241a01e82fdd6b1c24 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Scripts/Common/SingletonBase.cs b/Gameton-06/Assets/Gameton/Scripts/Common/SingletonBase.cs new file mode 100644 index 00000000..78d90125 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Common/SingletonBase.cs @@ -0,0 +1,47 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEditor; +using UnityEngine; + +namespace TON +{ + public class SingletonBase : MonoBehaviour where T : class + { + public static T Singleton + { + get + { + return _instance.Value; + } + } + + private static readonly Lazy _instance = new Lazy(() => + { + T instance = FindObjectOfType(typeof(T)) as T; + if (instance == null) + { + GameObject obj = new GameObject(typeof(T).Name); + instance = obj.AddComponent(typeof(T)) as T; + +#if UNITY_EDITOR + if (EditorApplication.isPlaying) + { + DontDestroyOnLoad(obj); + } + +#else + DontDestroyOnLoad(obj); +#endif + } + + return instance; + }); + + protected virtual void Awake() + { + DontDestroyOnLoad(gameObject); + } + + } +} diff --git a/Gameton-06/Assets/Gameton/Scripts/Common/SingletonBase.cs.meta b/Gameton-06/Assets/Gameton/Scripts/Common/SingletonBase.cs.meta new file mode 100644 index 00000000..9ee49da7 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Common/SingletonBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1e60be2f565d8334ca8bde4d14b67ec4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Scripts/Common/UIBase.cs b/Gameton-06/Assets/Gameton/Scripts/Common/UIBase.cs new file mode 100644 index 00000000..205033fa --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Common/UIBase.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace TON +{ + public class UIBase : MonoBehaviour + { + public virtual void Show() + { + gameObject.SetActive(true); + } + + public virtual void Hide() + { + gameObject.SetActive(false); + } + } +} diff --git a/Gameton-06/Assets/Gameton/Scripts/Common/UIBase.cs.meta b/Gameton-06/Assets/Gameton/Scripts/Common/UIBase.cs.meta new file mode 100644 index 00000000..3b041e1e --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Common/UIBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d8bca0d4dac93b34e8249704224536c3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Scripts/Common/UIList.cs b/Gameton-06/Assets/Gameton/Scripts/Common/UIList.cs new file mode 100644 index 00000000..d569e515 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Common/UIList.cs @@ -0,0 +1,25 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace TON +{ + public enum UIList + { + PANEL_START, + + TitleUI, + IngameUI, + LogUI, + + + PANEL_END, + + POPUP_START, + PausePopupUI, + LoadingUI, + + + POPUP_END, + } +} diff --git a/Gameton-06/Assets/Gameton/Scripts/Common/UIList.cs.meta b/Gameton-06/Assets/Gameton/Scripts/Common/UIList.cs.meta new file mode 100644 index 00000000..d3a77103 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Common/UIList.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e7771782ad5d4d14e9f71884356ae993 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Scripts/Common/UIManager.cs b/Gameton-06/Assets/Gameton/Scripts/Common/UIManager.cs new file mode 100644 index 00000000..857035e4 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Common/UIManager.cs @@ -0,0 +1,108 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace TON +{ + public class UIManager : SingletonBase + { + public static T Show(UIList uiName) where T : UIBase + { + var targetUI = Singleton.GetUI(uiName); + + if (targetUI == null) + { + return null; + } + + targetUI.Show(); + return targetUI; + } + + public static T Hide(UIList uiName) where T : UIBase + { + var targetUI = Singleton.GetUI(uiName); + + if (targetUI == null) + { + return null; + } + + targetUI.Hide(); + return targetUI; + } + + private Dictionary panels = new Dictionary(); + private Dictionary popups = new Dictionary(); + + private Transform panelRoot; + private Transform popupRoot; + private const string UI_PATH = "UI/Prefabs/"; + + public void Initalize() + { + if (panelRoot == null) + { + GameObject panelGo = new GameObject("Panel Root"); + panelRoot = panelGo.transform; + panelRoot.SetParent(transform); + } + if (popupRoot == null) + { + GameObject popupGo = new GameObject("Popup Root"); + popupRoot = popupGo.transform; + popupRoot.SetParent(transform); + } + + for (int i = (int)UIList.PANEL_START + 1; i < (int)UIList.PANEL_END; i++) + { + panels.Add((UIList)i, null); + } + + for (int i = (int)UIList.POPUP_START + 1; i < (int)UIList.POPUP_END; i++) + { + popups.Add((UIList)i, null); + } + + + } + + public T GetUI(UIList uiName, bool isReload = false) where T : UIBase + { + Dictionary container = null; + if (uiName > UIList.PANEL_START && uiName < UIList.PANEL_END) + { + container = panels; + } + else + { + container = popups; + } + + if (!container.ContainsKey(uiName)) + { + return null; + } + + if (isReload && container[uiName]) + { + Destroy(container[uiName].gameObject); + container[uiName] = null; + } + + if (!container[uiName]) + { + string path = UI_PATH + $"UI.{uiName}"; + T result = Resources.Load(path) as T; + + if (result) + { + container[uiName] = Instantiate(result, container == panels ? panelRoot : popupRoot); + container[uiName].gameObject.SetActive(false); + } + } + + return container[uiName] as T; + } + } +} diff --git a/Gameton-06/Assets/Gameton/Scripts/Common/UIManager.cs.meta b/Gameton-06/Assets/Gameton/Scripts/Common/UIManager.cs.meta new file mode 100644 index 00000000..43a6e758 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Common/UIManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fed807c49e259cf45b2b4b591f941822 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Scripts/Scenes/IngameScene.cs b/Gameton-06/Assets/Gameton/Scripts/Scenes/IngameScene.cs new file mode 100644 index 00000000..57aa14a8 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Scenes/IngameScene.cs @@ -0,0 +1,38 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.SceneManagement; + +namespace TON +{ + public class IngameScene : SceneBase + { + + public override IEnumerator OnStart() + { + // Ingame 씬을 비동기로 로드한다. + AsyncOperation asyncLoad = SceneManager.LoadSceneAsync("Ingame", LoadSceneMode.Single); + + // 로드가 완료될 때 까지 yield return null 을 하면서 기다린다 + while (!asyncLoad.isDone) + { + yield return null; + } + + UIManager.Show(UIList.IngameUI); + } + public override IEnumerator OnEnd() + { + yield return null; + + UIManager.Hide(UIList.IngameUI); + } + + void OnEscapeExecute() + { + // TODO : 게임 일시정지 UI 노출 시 수행 + // Time.timeScale = 0f; + // UIManager.Show(UIList.PausePopupUI); + } + } +} diff --git a/Gameton-06/Assets/Gameton/Scripts/Scenes/IngameScene.cs.meta b/Gameton-06/Assets/Gameton/Scripts/Scenes/IngameScene.cs.meta new file mode 100644 index 00000000..f5e04ce8 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Scenes/IngameScene.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a468df02c01075748a9dd91a1d2ebfa8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Scripts/Scenes/TitleScene.cs b/Gameton-06/Assets/Gameton/Scripts/Scenes/TitleScene.cs new file mode 100644 index 00000000..706a6804 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Scenes/TitleScene.cs @@ -0,0 +1,31 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.SceneManagement; + +namespace TON +{ + public class TitleScene : SceneBase + { + public override IEnumerator OnStart() + { + // Title 씬을 비동기로 로드한다. + AsyncOperation asyncLoad = SceneManager.LoadSceneAsync("Title", LoadSceneMode.Single); + + // 로드가 완료될 때 까지 yield return null 을 하면서 기다린다 + while (!asyncLoad.isDone) + { + yield return null; + } + + UIManager.Show(UIList.TitleUI); + } + + public override IEnumerator OnEnd() + { + yield return null; + + UIManager.Hide(UIList.TitleUI); + } + } +} diff --git a/Gameton-06/Assets/Gameton/Scripts/Scenes/TitleScene.cs.meta b/Gameton-06/Assets/Gameton/Scripts/Scenes/TitleScene.cs.meta new file mode 100644 index 00000000..1bee2a98 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Scenes/TitleScene.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5029637b314ef0640afdf5241828f847 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/IngameUI.cs b/Gameton-06/Assets/Gameton/Scripts/UI/IngameUI.cs new file mode 100644 index 00000000..5e633dbb --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/UI/IngameUI.cs @@ -0,0 +1,35 @@ +using System.Collections; +using System.Collections.Generic; +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +namespace TON +{ + public class IngameUI : UIBase + { + public static IngameUI Instance => UIManager.Singleton.GetUI(UIList.IngameUI); + + public Image hpBar; + public Image spBar; + + public TextMeshProUGUI hpText; + public TextMeshProUGUI spText; + + public void SetHP(float current, float max) + { + hpBar.fillAmount = current / max; + hpText.text = $"{current:0} / {max: 0}"; + } + + public void SetSP(float current, float max) + { + spBar.fillAmount = current / max; + spText.text = $"{current:0} / {max: 0}"; + } + + + + + } +} diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/IngameUI.cs.meta b/Gameton-06/Assets/Gameton/Scripts/UI/IngameUI.cs.meta new file mode 100644 index 00000000..aed0c6b1 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/UI/IngameUI.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c00fc90238999db44b3bd05365097e20 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/LoadingUI.cs b/Gameton-06/Assets/Gameton/Scripts/UI/LoadingUI.cs new file mode 100644 index 00000000..5f888471 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/UI/LoadingUI.cs @@ -0,0 +1,11 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace TON +{ + public class LoadingUI : UIBase + { + + } +} diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/LoadingUI.cs.meta b/Gameton-06/Assets/Gameton/Scripts/UI/LoadingUI.cs.meta new file mode 100644 index 00000000..4ab0b6a7 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/UI/LoadingUI.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8a8d039df45deab40974bc49691b2dba +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/TitleUI.cs b/Gameton-06/Assets/Gameton/Scripts/UI/TitleUI.cs new file mode 100644 index 00000000..c7361154 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/UI/TitleUI.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace TON +{ + public class TitleUI : UIBase + { + public void OnClickStartButton() + { + Main.Singleton?.ChangeScene(SceneType.Ingame); + } + + public void OnClickExitButton() + { + Main.Singleton?.SystemQuit(); + } + } +} diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/TitleUI.cs.meta b/Gameton-06/Assets/Gameton/Scripts/UI/TitleUI.cs.meta new file mode 100644 index 00000000..7bfe0631 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/UI/TitleUI.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fc0dce4fb90a31a43927108fa0c15b2b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/ProjectSettings/EditorBuildSettings.asset b/Gameton-06/ProjectSettings/EditorBuildSettings.asset index 19f97fc0..7011dcfd 100644 --- a/Gameton-06/ProjectSettings/EditorBuildSettings.asset +++ b/Gameton-06/ProjectSettings/EditorBuildSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1942c088ddfeeef348fdf12390e2a2d6da51056e197458d67969d44e7b2cbbd3 -size 160 +oid sha256:dbe0aa7460fcf68e644b3c53037ac495e87f64ab6bc260bd30b7fc6105220525 +size 565 diff --git a/Gameton-06/ProjectSettings/EditorSettings.asset b/Gameton-06/ProjectSettings/EditorSettings.asset index 8087097e..6ab94355 100644 --- a/Gameton-06/ProjectSettings/EditorSettings.asset +++ b/Gameton-06/ProjectSettings/EditorSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:705e5dde8b4ceb8147971b0c8f3781ebbe566a12b8e280379ee24f2bd9ad9474 -size 970 +oid sha256:d314f64b0b844d45a37fef26ca8927c1972e5eb5732def3a9f37b50a966d8ec7 +size 1487 diff --git a/Gameton-06/ProjectSettings/ProjectSettings.asset b/Gameton-06/ProjectSettings/ProjectSettings.asset index b29c0e14..03967595 100644 --- a/Gameton-06/ProjectSettings/ProjectSettings.asset +++ b/Gameton-06/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:630ef10e2a6f4af21f04e7efb9b17342b9823f4cb242d3e390cf53ec8cdc8bbd -size 21895 +oid sha256:ed65b7fa102efb7cde84c026008a0fe27302c70555a9bccd43a81bdce8a6c6e3 +size 21866 diff --git a/Gameton-06/ProjectSettings/SceneTemplateSettings.json b/Gameton-06/ProjectSettings/SceneTemplateSettings.json new file mode 100644 index 00000000..5e97f839 --- /dev/null +++ b/Gameton-06/ProjectSettings/SceneTemplateSettings.json @@ -0,0 +1,121 @@ +{ + "templatePinStates": [], + "dependencyTypeInfos": [ + { + "userAdded": false, + "type": "UnityEngine.AnimationClip", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.Animations.AnimatorController", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.AnimatorOverrideController", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.Audio.AudioMixerController", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.ComputeShader", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.Cubemap", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.GameObject", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.LightingDataAsset", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.LightingSettings", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Material", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.MonoScript", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicMaterial", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicsMaterial2D", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessResources", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.VolumeProfile", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.SceneAsset", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.Shader", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.ShaderVariantCollection", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.Texture", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Texture2D", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Timeline.TimelineAsset", + "defaultInstantiationMode": 0 + } + ], + "defaultDependencyTypeInfo": { + "userAdded": false, + "type": "", + "defaultInstantiationMode": 1 + }, + "newSceneOverride": 0 +} \ No newline at end of file