Merge pull request #98 from Degulleo/DO-93-불필요한-주석-등-정리
DO-93 [Style] 불필요한 부분 정리
This commit is contained in:
commit
bd05fc55e1
@ -1,8 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1a1e8e30f7d4a53499404409beda5805
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -1,712 +0,0 @@
|
||||
%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: 3
|
||||
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
|
||||
m_SkyboxMaterial: {fileID: 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: 0
|
||||
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 &81838204
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 81838205}
|
||||
- component: {fileID: 81838206}
|
||||
m_Layer: 0
|
||||
m_Name: MainPanelManager
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &81838205
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 81838204}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &81838206
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 81838204}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0696b08f74b24325a7b378405f6170af, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
loadingPanelController: {fileID: 1454248679793356470, guid: 634a60576b4855940a97d1e7447b9fcc, type: 3}
|
||||
mainPanelController: {fileID: 7488082087611091670, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
--- !u!1 &271965288
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 271965289}
|
||||
- component: {fileID: 271965290}
|
||||
m_Layer: 0
|
||||
m_Name: GameManager
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &271965289
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 271965288}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &271965290
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 271965288}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 35a4c6d5d3a97b444b968e68ec8bb9f7, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
panelManagerPrefab: {fileID: 3475740041361426276, guid: 085ca07ca90c92545b2594bd13412701, type: 3}
|
||||
audioManagerPrefab: {fileID: 2946408323859178723, guid: e829818dce39a5d4383e061111bed871, type: 3}
|
||||
--- !u!1 &333752980
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 333752983}
|
||||
- component: {fileID: 333752982}
|
||||
- component: {fileID: 333752981}
|
||||
m_Layer: 0
|
||||
m_Name: Main Camera
|
||||
m_TagString: MainCamera
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!81 &333752981
|
||||
AudioListener:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 333752980}
|
||||
m_Enabled: 1
|
||||
--- !u!20 &333752982
|
||||
Camera:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 333752980}
|
||||
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 &333752983
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 333752980}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -10}
|
||||
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 &740636828
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 740636831}
|
||||
- component: {fileID: 740636830}
|
||||
- component: {fileID: 740636829}
|
||||
m_Layer: 0
|
||||
m_Name: EventSystem
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &740636829
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 740636828}
|
||||
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 &740636830
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 740636828}
|
||||
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!4 &740636831
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 740636828}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &1545261105
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 1867732347}
|
||||
m_Modifications:
|
||||
- target: {fileID: 180756268084732627, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 180756268084732627, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 180756268084732627, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 180756268084732627, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 713532354933724924, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 713532354933724924, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 713532354933724924, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
|
||||
value:
|
||||
objectReference: {fileID: 1545261107}
|
||||
- target: {fileID: 713532354933724924, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 713532354933724924, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
|
||||
value: OnClickGameStart
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 713532354933724924, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
|
||||
value: MainPanelController, Assembly-CSharp
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 713532354933724924, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
|
||||
value: UnityEngine.Object, UnityEngine
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4282069284025755619, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4733773333797619672, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4733773333797619672, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4733773333797619672, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4733773333797619672, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5033979732381400892, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5033979732381400892, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5033979732381400892, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5033979732381400892, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8446481687955831510, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8446481687955831510, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8446481687955831510, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8446481687955831510, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8564394481744056992, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Main Panel
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8768541925252566370, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8768541925252566370, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8768541925252566370, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8768541925252566370, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
--- !u!224 &1545261106 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
m_PrefabInstance: {fileID: 1545261105}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1545261107 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 7488082087611091670, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
|
||||
m_PrefabInstance: {fileID: 1545261105}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: b4dc3fd9e59f47df80e344680d1b9803, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &1867732343
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1867732347}
|
||||
- component: {fileID: 1867732346}
|
||||
- component: {fileID: 1867732345}
|
||||
- component: {fileID: 1867732344}
|
||||
m_Layer: 5
|
||||
m_Name: Canvas
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &1867732344
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1867732343}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreReversedGraphics: 1
|
||||
m_BlockingObjects: 0
|
||||
m_BlockingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
--- !u!114 &1867732345
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1867732343}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_UiScaleMode: 0
|
||||
m_ReferencePixelsPerUnit: 100
|
||||
m_ScaleFactor: 1
|
||||
m_ReferenceResolution: {x: 800, y: 600}
|
||||
m_ScreenMatchMode: 0
|
||||
m_MatchWidthOrHeight: 0
|
||||
m_PhysicalUnit: 3
|
||||
m_FallbackScreenDPI: 96
|
||||
m_DefaultSpriteDPI: 96
|
||||
m_DynamicPixelsPerUnit: 1
|
||||
m_PresetInfoIsWorld: 0
|
||||
--- !u!223 &1867732346
|
||||
Canvas:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1867732343}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_RenderMode: 0
|
||||
m_Camera: {fileID: 0}
|
||||
m_PlaneDistance: 100
|
||||
m_PixelPerfect: 0
|
||||
m_ReceivesEvents: 1
|
||||
m_OverrideSorting: 0
|
||||
m_OverridePixelPerfect: 0
|
||||
m_SortingBucketNormalizedSize: 0
|
||||
m_VertexColorAlwaysGammaSpace: 0
|
||||
m_AdditionalShaderChannelsFlag: 25
|
||||
m_UpdateRectTransformForStandalone: 0
|
||||
m_SortingLayerID: 0
|
||||
m_SortingOrder: 0
|
||||
m_TargetDisplay: 0
|
||||
--- !u!224 &1867732347
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1867732343}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0, y: 0, z: 0}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1545261106}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 0}
|
||||
--- !u!1660057539 &9223372036854775807
|
||||
SceneRoots:
|
||||
m_ObjectHideFlags: 0
|
||||
m_Roots:
|
||||
- {fileID: 333752983}
|
||||
- {fileID: 271965289}
|
||||
- {fileID: 1867732347}
|
||||
- {fileID: 740636831}
|
||||
- {fileID: 81838205}
|
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: aa6a3e598ecaa6e4aa2ad0f1d81bea93
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 65aac0e22fe25aa42b9cf7df776a854d
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -59,12 +59,7 @@ public partial class GameLogic : IDisposable
|
||||
InitializeMultiplayerMode();
|
||||
break;
|
||||
case Enums.GameType.Replay:
|
||||
//TODO: 리플레이 구현
|
||||
break;
|
||||
// 현재 싱글 플레이로 바로 넘어가지 않기 때문에 미사용
|
||||
// case Enums.GameType.SinglePlay:
|
||||
// InitializeSinglePlayMode();
|
||||
// break;
|
||||
}
|
||||
}
|
||||
|
||||
@ -82,14 +77,12 @@ public partial class GameLogic : IDisposable
|
||||
switch (state)
|
||||
{
|
||||
case Constants.MultiplayManagerState.CreateRoom:
|
||||
Debug.Log("## Create Room");
|
||||
_roomId = data as string;
|
||||
break;
|
||||
case Constants.MultiplayManagerState.JoinRoom:
|
||||
Debug.Log("## Join Room");
|
||||
var joinRoomData = data as JoinRoomData;
|
||||
_roomId = joinRoomData.roomId;
|
||||
// TODO: 응답값 없을 때 서버에서 다시 받아오기 or AI 플레이로 넘기는 처리 필요
|
||||
|
||||
if (!ValidateRoomData(joinRoomData, "Join Room")) return;
|
||||
|
||||
// 플레이어 셋업
|
||||
@ -99,14 +92,11 @@ public partial class GameLogic : IDisposable
|
||||
StartGameOnMainThread();
|
||||
break;
|
||||
case Constants.MultiplayManagerState.SwitchAI:
|
||||
Debug.Log("## Switching to AI Mode");
|
||||
SwitchToSinglePlayer();
|
||||
break;
|
||||
case Constants.MultiplayManagerState.StartGame:
|
||||
Debug.Log("## Start Game");
|
||||
var startGameData = data as StartGameData;
|
||||
|
||||
// TODO: 응답값 없을 때 서버에서 다시 받아오기 or AI 플레이로 넘기는 처리 필요
|
||||
if (!ValidateRoomData(startGameData, "Start Game")) return;
|
||||
|
||||
// 플레이어 셋업
|
||||
@ -116,12 +106,9 @@ public partial class GameLogic : IDisposable
|
||||
StartGameOnMainThread();
|
||||
break;
|
||||
case Constants.MultiplayManagerState.ExitRoom:
|
||||
Debug.Log("## Exit Room"); // 방을 나갔으니 room id == null
|
||||
OpponentExist = false;
|
||||
// TODO: Exit Room 처리
|
||||
break;
|
||||
case Constants.MultiplayManagerState.EndGame:
|
||||
Debug.Log("## End Game");
|
||||
OpponentExist = false;
|
||||
ExecuteOnMainThread(() =>
|
||||
{
|
||||
@ -129,7 +116,6 @@ public partial class GameLogic : IDisposable
|
||||
});
|
||||
break;
|
||||
case Constants.MultiplayManagerState.DoSurrender:
|
||||
Debug.Log("상대방의 항복 요청 들어옴");
|
||||
ExecuteOnMainThread(() =>
|
||||
{
|
||||
GameManager.Instance.panelManager.OpenEffectPanel(Enums.GameResult.Win);
|
||||
@ -137,7 +123,6 @@ public partial class GameLogic : IDisposable
|
||||
});
|
||||
break;
|
||||
case Constants.MultiplayManagerState.SurrenderConfirmed:
|
||||
Debug.Log("항복 요청 전송 완료");
|
||||
ExecuteOnMainThread(() =>
|
||||
{
|
||||
GameManager.Instance.panelManager.OpenEffectPanel(Enums.GameResult.Lose);
|
||||
@ -145,7 +130,6 @@ public partial class GameLogic : IDisposable
|
||||
});
|
||||
break;
|
||||
case Constants.MultiplayManagerState.ReceiveDrawRequest:
|
||||
Debug.Log("상대방의 무승부 요청 들어옴");
|
||||
TimerPause();
|
||||
ExecuteOnMainThread(() =>
|
||||
{
|
||||
@ -163,7 +147,6 @@ public partial class GameLogic : IDisposable
|
||||
break;
|
||||
case Constants.MultiplayManagerState.DrawRequestSent:
|
||||
{
|
||||
Debug.Log("무승부 요청 전송 완료");
|
||||
ExecuteOnMainThread(() =>
|
||||
{
|
||||
GameManager.Instance.panelManager.OpenLoadingPanel(true, true, false, false);
|
||||
@ -172,7 +155,6 @@ public partial class GameLogic : IDisposable
|
||||
break;
|
||||
}
|
||||
case Constants.MultiplayManagerState.DrawAccepted:
|
||||
Debug.Log("무승부 요청이 승낙이 들어옴");
|
||||
ExecuteOnMainThread(() =>
|
||||
{
|
||||
GameManager.Instance.panelManager.CloseLoadingPanel();
|
||||
@ -182,7 +164,6 @@ public partial class GameLogic : IDisposable
|
||||
break;
|
||||
case Constants.MultiplayManagerState.DrawConfirmed:
|
||||
{
|
||||
Debug.Log("무승부 요청 승낙 완료");
|
||||
ExecuteOnMainThread(() =>
|
||||
{
|
||||
GameManager.Instance.panelManager.CloseLoadingPanel();
|
||||
@ -190,7 +171,6 @@ public partial class GameLogic : IDisposable
|
||||
break;
|
||||
}
|
||||
case Constants.MultiplayManagerState.DrawRejected:
|
||||
Debug.Log("무승부 요청이 거부가 들어옴");
|
||||
ExecuteOnMainThread(() =>
|
||||
{
|
||||
GameManager.Instance.panelManager.CloseLoadingPanel();
|
||||
@ -200,7 +180,6 @@ public partial class GameLogic : IDisposable
|
||||
break;
|
||||
case Constants.MultiplayManagerState.DrawRejectionConfirmed:
|
||||
{
|
||||
Debug.Log("무승부 요청 거부 완료");
|
||||
ExecuteOnMainThread(() =>
|
||||
{
|
||||
GameManager.Instance.panelManager.CloseLoadingPanel();
|
||||
@ -209,7 +188,6 @@ public partial class GameLogic : IDisposable
|
||||
break;
|
||||
}
|
||||
case Constants.MultiplayManagerState.ReceiveTimeout:
|
||||
Debug.Log("상대방이 타임 아웃 됨");
|
||||
ExecuteOnMainThread(() =>
|
||||
{
|
||||
GameManager.Instance.panelManager.OpenEffectPanel(Enums.GameResult.Win);
|
||||
@ -217,10 +195,8 @@ public partial class GameLogic : IDisposable
|
||||
});
|
||||
break;
|
||||
case Constants.MultiplayManagerState.RevengeRequestSent:
|
||||
Debug.Log("재대결 요청: 전송 완료");
|
||||
break;
|
||||
case Constants.MultiplayManagerState.ReceiveRevengeRequest:
|
||||
Debug.Log("상대방의 재대결 요청이 들어옴");
|
||||
ChangeGameInProgress(true);
|
||||
ExecuteOnMainThread(() =>
|
||||
{
|
||||
@ -234,15 +210,9 @@ public partial class GameLogic : IDisposable
|
||||
});
|
||||
break;
|
||||
case Constants.MultiplayManagerState.RevengeAccepted:
|
||||
Debug.Log("재대결 요청: 승낙이 들어옴");
|
||||
var revengeAcceptedData = data as RevengeData;
|
||||
|
||||
// TODO: 응답값 없을 때 서버에서 다시 받아오기 or AI 플레이로 넘기는 처리 필요
|
||||
if (revengeAcceptedData == null)
|
||||
{
|
||||
Debug.Log("RevengeAccepted 응답값이 null 입니다");
|
||||
return;
|
||||
}
|
||||
if (revengeAcceptedData == null) return;
|
||||
|
||||
// 선공, 후공 처리
|
||||
isFirstPlayer = revengeAcceptedData.isBlack;
|
||||
@ -256,15 +226,9 @@ public partial class GameLogic : IDisposable
|
||||
});
|
||||
break;
|
||||
case Constants.MultiplayManagerState.RevengeConfirmed:
|
||||
Debug.Log("재대결 요청: 승낙 완료");
|
||||
var revengConfirmedData = data as RevengeData;
|
||||
|
||||
// TODO: 응답값 없을 때 서버에서 다시 받아오기 or AI 플레이로 넘기는 처리 필요
|
||||
if (revengConfirmedData == null)
|
||||
{
|
||||
Debug.Log("RevengeConfirmed 응답값이 null 입니다");
|
||||
return;
|
||||
}
|
||||
if (revengConfirmedData == null) return;
|
||||
|
||||
// 선공, 후공 처리
|
||||
isFirstPlayer = revengConfirmedData.isBlack;
|
||||
@ -278,7 +242,6 @@ public partial class GameLogic : IDisposable
|
||||
});
|
||||
break;
|
||||
case Constants.MultiplayManagerState.RevengeRejected:
|
||||
Debug.Log("재대결 요청: 거부가 들어옴");
|
||||
ExecuteOnMainThread(() =>
|
||||
{
|
||||
GameManager.Instance.panelManager.OpenConfirmPanel("상대방이\n재대결 요청을\n거부하였습니다.", () =>
|
||||
@ -288,7 +251,6 @@ public partial class GameLogic : IDisposable
|
||||
});
|
||||
break;
|
||||
case Constants.MultiplayManagerState.RevengeRejectionConfirmed:
|
||||
Debug.Log("재대결 요청: 거부 완료");
|
||||
ExecuteOnMainThread(() =>
|
||||
{
|
||||
GameManager.Instance.panelManager.OpenConfirmPanel("재대결 요청을\n거부하였습니다.", () =>
|
||||
@ -298,7 +260,6 @@ public partial class GameLogic : IDisposable
|
||||
});
|
||||
break;
|
||||
case Constants.MultiplayManagerState.OpponentDisconnected:
|
||||
Debug.Log("상대방 강제 종료");
|
||||
OpponentExist = false;
|
||||
ExecuteOnMainThread(() =>
|
||||
{
|
||||
@ -310,7 +271,7 @@ public partial class GameLogic : IDisposable
|
||||
});
|
||||
break;
|
||||
}
|
||||
ReplayManager.Instance.InitReplayData(UserManager.Instance.Nickname,"nicknameB");
|
||||
ReplayManager.Instance.InitReplayData(UserManager.Instance.Nickname,_opponentNickname);
|
||||
});
|
||||
|
||||
MultiPlayManager.RegisterPlayer(UserManager.Instance.Nickname, UserManager.Instance.Rating, UserManager.Instance.imageIndex);
|
||||
@ -326,7 +287,6 @@ public partial class GameLogic : IDisposable
|
||||
|
||||
if (isFirstPlayer)
|
||||
{
|
||||
Debug.Log("해당 플레이어가 선공 입니다");
|
||||
FirstPlayerState = new PlayerState(true, MultiPlayManager, roomId);
|
||||
SecondPlayerState = new MultiPlayerState(false, MultiPlayManager);
|
||||
|
||||
@ -334,7 +294,6 @@ public partial class GameLogic : IDisposable
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.Log("해당 플레이어가 후공 입니다");
|
||||
FirstPlayerState = new MultiPlayerState(true, MultiPlayManager);
|
||||
SecondPlayerState = new PlayerState(false, MultiPlayManager, roomId);
|
||||
|
||||
@ -396,11 +355,7 @@ public partial class GameLogic : IDisposable
|
||||
// 방 데이터 유효성 검사 헬퍼 함수
|
||||
private bool ValidateRoomData(object roomData, string operationName)
|
||||
{
|
||||
if (roomData == null)
|
||||
{
|
||||
Debug.Log($"{operationName} 응답값이 null 입니다");
|
||||
return false;
|
||||
}
|
||||
if (roomData == null) return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -420,9 +375,6 @@ public partial class GameLogic : IDisposable
|
||||
// 메인 스레드에서 실행 - UI 업데이트는 메인 스레드에서 실행 필요
|
||||
UnityMainThreadDispatcher.Instance().Enqueue(() =>
|
||||
{
|
||||
// 스레드 확인 로그: 추후 디버깅 시 필요할 수 있을 것 같아 남겨둡니다
|
||||
// Debug.Log($"[UnityMainThreadDispatcher] 실행 스레드: {System.Threading.Thread.CurrentThread.ManagedThreadId}");
|
||||
|
||||
//AI닉네임 랜덤생성
|
||||
var aiName = RandomAINickname();
|
||||
var imageIndex = Random.Range(0, 2);
|
||||
|
@ -82,7 +82,6 @@ public class GameManager : Singleton<GameManager>
|
||||
public void ChangeToMainScene()
|
||||
{
|
||||
_gameType = Enums.GameType.None;
|
||||
// TODO: 추후 혹시 모를 존재하는 socket 통신 종료 필요 - _gameLogic?.Dispose에서 LeaveRoom 호출하긴 하는데 서버에서 이미 해당 방을 삭제했을 경우 동작 확인 필요
|
||||
if (_multiplayManager.GetRoomId() != null) // null 에러 방지
|
||||
{
|
||||
_gameLogic?.Dispose();
|
||||
|
@ -15,17 +15,13 @@
|
||||
public override void OnEnter(GameLogic gameLogic)
|
||||
{
|
||||
gameLogic.FioTimer.StartTimer();
|
||||
//TODO: 첫번째 플레이어면 렌주 룰 확인
|
||||
#region Renju Turn Set
|
||||
// 턴이 변경될 때마다 금수 위치 업데이트
|
||||
gameLogic.UpdateForbiddenMoves();
|
||||
#endregion
|
||||
|
||||
gameLogic.CurrentTurn = _playerType;
|
||||
// gameLogic.stoneController.OnStoneClickedDelegate = (row, col) =>
|
||||
// {
|
||||
// HandleMove(gameLogic, row, col);
|
||||
// };
|
||||
|
||||
_multiplayManager.OnOpponentMove = moveData =>
|
||||
{
|
||||
var row = moveData.position.x;
|
||||
|
@ -23,7 +23,6 @@
|
||||
{
|
||||
gameLogic.FioTimer.StartTimer();
|
||||
|
||||
//TODO: 첫번째 플레이어면 렌주 룰 확인
|
||||
#region Renju Turn Set
|
||||
// 턴이 변경될 때마다 금수 위치 업데이트
|
||||
gameLogic.UpdateForbiddenMoves();
|
||||
@ -38,8 +37,6 @@
|
||||
|
||||
public override void OnExit(GameLogic gameLogic)
|
||||
{
|
||||
//TODO: 렌주 룰 금수자리 초기화
|
||||
|
||||
gameLogic.FioTimer.InitTimer();
|
||||
gameLogic.StoneController.OnStoneClickedDelegate = null;
|
||||
}
|
||||
|
@ -11,15 +11,8 @@ public class MainPanelManager : MonoBehaviour
|
||||
|
||||
private UserManager _userManager; // UserManager 인스턴스 관리
|
||||
|
||||
// private void Awake()
|
||||
// {
|
||||
// loadingPanelController = GameObject.Find("LoadingPanel").GetComponent<LoadingPanelController>();
|
||||
// mainPanelController = GameObject.Find("MainPanel").GetComponent<MainPanelController>();
|
||||
// }
|
||||
//
|
||||
private void Start()
|
||||
{
|
||||
// UserManager가 없으면 생성
|
||||
if (UserManager.Instance == null)
|
||||
{
|
||||
GameObject userManagerObj = new GameObject("UserManager");
|
||||
@ -41,8 +34,6 @@ public class MainPanelManager : MonoBehaviour
|
||||
UserManager.Instance.SetUserInfo(userInfo);
|
||||
|
||||
UpdateMainPanelUI(GameManager.Instance.panelManager.OpenMainPanel);
|
||||
// ScoreData.SetScore(userInfo.score);
|
||||
// GameManager.Instance.panelManager.OpenConfirmPanel(userInfo.nickname + "님" + "\n" + "자동 로그인 되었습니다", () => { });
|
||||
|
||||
loadingPanelController.StopLoading();
|
||||
}, () =>
|
||||
@ -55,15 +46,12 @@ public class MainPanelManager : MonoBehaviour
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 유저 별명, 급수를 서버에서 가져온 정보로 업데이트하여 메인화면에 표시
|
||||
/// </summary>
|
||||
public void UpdateMainPanelUI(Action success = null)
|
||||
{
|
||||
mainPanelController.UpdateUserInfo();
|
||||
|
||||
success?.Invoke();
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -9,7 +9,6 @@ public class NetworkManager : Singleton<NetworkManager>
|
||||
{
|
||||
protected override void OnSceneLoaded(Scene scene, LoadSceneMode mode)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public void Signup(SignupData signupData, Action success, Action failure)
|
||||
@ -33,17 +32,18 @@ public class NetworkManager : Singleton<NetworkManager>
|
||||
if (www.result == UnityWebRequest.Result.ConnectionError ||
|
||||
www.result == UnityWebRequest.Result.ProtocolError)
|
||||
{
|
||||
Debug.Log("Error: " + www.error);
|
||||
|
||||
if (www.responseCode == 409)
|
||||
{
|
||||
Debug.Log("중복사용자");
|
||||
// 중복 사용자 생성 팝업 표시
|
||||
GameManager.Instance.panelManager.OpenConfirmPanel("이미 존재하는 사용자입니다.", () =>
|
||||
{
|
||||
failure?.Invoke();
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
failure?.Invoke();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -80,7 +80,7 @@ public class NetworkManager : Singleton<NetworkManager>
|
||||
if (www.result == UnityWebRequest.Result.ConnectionError ||
|
||||
www.result == UnityWebRequest.Result.ProtocolError)
|
||||
{
|
||||
Debug.Log("Error: " + www.error);
|
||||
failure?.Invoke(2);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -97,8 +97,6 @@ public class NetworkManager : Singleton<NetworkManager>
|
||||
|
||||
if (signinResult.result == 0)
|
||||
{
|
||||
Debug.Log("유저 이메일이 유효하지 않습니다.");
|
||||
failure?.Invoke(0);
|
||||
// 유저 이메일 유효하지 않음 팝업 표시
|
||||
GameManager.Instance.panelManager.OpenConfirmPanel("이메일이 유효하지 않습니다.", () =>
|
||||
{
|
||||
@ -107,8 +105,6 @@ public class NetworkManager : Singleton<NetworkManager>
|
||||
}
|
||||
else if (signinResult.result == 1)
|
||||
{
|
||||
Debug.Log("패스워드가 유효하지 않습니다.");
|
||||
failure?.Invoke(1);
|
||||
// 패스워드가 유효하지 않음 팝업 표시
|
||||
GameManager.Instance.panelManager.OpenConfirmPanel("패스워드가 유효하지 않습니다.", () =>
|
||||
{
|
||||
@ -117,14 +113,7 @@ public class NetworkManager : Singleton<NetworkManager>
|
||||
}
|
||||
else if (signinResult.result == 2)
|
||||
{
|
||||
Debug.Log("로그인에 성공하였습니다.");
|
||||
success?.Invoke(signinResult);
|
||||
|
||||
// 성공 팝업 표시
|
||||
// GameManager.Instance.panelManager.OpenConfirmPanel("로그인에 성공하였습니다.", () =>
|
||||
// {
|
||||
// success?.Invoke();
|
||||
// });
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -148,10 +137,6 @@ public class NetworkManager : Singleton<NetworkManager>
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.LogError("SID 값이 없습니다. 로그인 정보가 없습니다.");
|
||||
// GameManager.Instance.panelManager.OpenConfirmPanel("SID 값이 없습니다. 로그인 정보가 없습니다.", () =>
|
||||
// {
|
||||
// });
|
||||
failure?.Invoke();
|
||||
yield break; // 더 이상 진행하지 않고 종료
|
||||
}
|
||||
@ -163,10 +148,6 @@ public class NetworkManager : Singleton<NetworkManager>
|
||||
{
|
||||
if (www.responseCode == 403)
|
||||
{
|
||||
Debug.Log("로그인이 필요합니다.");
|
||||
// GameManager.Instance.panelManager.OpenConfirmPanel("로그인이 필요합니다.", () =>
|
||||
// {
|
||||
// });
|
||||
failure?.Invoke();
|
||||
}
|
||||
}
|
||||
@ -190,7 +171,6 @@ public class NetworkManager : Singleton<NetworkManager>
|
||||
string sid = PlayerPrefs.GetString("sid", "");
|
||||
if (string.IsNullOrEmpty(sid))
|
||||
{
|
||||
Debug.Log("로그인 정보가 없습니다.");
|
||||
GameManager.Instance.panelManager.OpenConfirmPanel("로그인이 필요합니다.", () =>
|
||||
{
|
||||
failure?.Invoke();
|
||||
@ -209,7 +189,6 @@ public class NetworkManager : Singleton<NetworkManager>
|
||||
{
|
||||
if (www.responseCode == 403)
|
||||
{
|
||||
Debug.Log("로그인이 필요합니다.");
|
||||
GameManager.Instance.panelManager.OpenConfirmPanel("로그인이 필요합니다.", () => { });
|
||||
}
|
||||
failure?.Invoke();
|
||||
@ -254,7 +233,6 @@ public class NetworkManager : Singleton<NetworkManager>
|
||||
{
|
||||
if (www.responseCode == 403)
|
||||
{
|
||||
Debug.Log("로그인이 필요합니다.");
|
||||
GameManager.Instance.panelManager.OpenConfirmPanel("로그인이 필요합니다.", () => { });
|
||||
}
|
||||
|
||||
@ -294,7 +272,6 @@ public class NetworkManager : Singleton<NetworkManager>
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.LogError("SID 값이 없습니다. 로그인 정보가 없습니다.");
|
||||
GameManager.Instance.panelManager.OpenConfirmPanel("SID 값이 없습니다. 로그인 정보가 없습니다.", () =>
|
||||
{
|
||||
failure?.Invoke();
|
||||
@ -309,7 +286,6 @@ public class NetworkManager : Singleton<NetworkManager>
|
||||
{
|
||||
if (www.responseCode == 403)
|
||||
{
|
||||
Debug.Log("로그인이 필요합니다.");
|
||||
GameManager.Instance.panelManager.OpenConfirmPanel("로그인이 필요합니다.", () => { });
|
||||
}
|
||||
|
||||
@ -354,7 +330,6 @@ public class NetworkManager : Singleton<NetworkManager>
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.LogError("SID 값이 없습니다. 로그인 정보가 없습니다.");
|
||||
failure?.Invoke();
|
||||
yield break;
|
||||
}
|
||||
@ -364,7 +339,6 @@ public class NetworkManager : Singleton<NetworkManager>
|
||||
if (www.result == UnityWebRequest.Result.ConnectionError ||
|
||||
www.result == UnityWebRequest.Result.ProtocolError)
|
||||
{
|
||||
Debug.Log("광고 시청 후 코인 충전 실패: " + www.error);
|
||||
failure?.Invoke();
|
||||
}
|
||||
else
|
||||
@ -374,13 +348,11 @@ public class NetworkManager : Singleton<NetworkManager>
|
||||
|
||||
if (rechargeResult.result == "SUCCESS")
|
||||
{
|
||||
Debug.Log("광고 시청으로 코인 충전 완료: " + rechargeResult.recharged);
|
||||
UserManager.Instance.SetCoinsInfo();
|
||||
success?.Invoke(rechargeResult.recharged);
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.Log("광고 시청 후 충전 실패: " + rechargeResult.result);
|
||||
failure?.Invoke();
|
||||
}
|
||||
}
|
||||
@ -392,7 +364,7 @@ public class NetworkManager : Singleton<NetworkManager>
|
||||
/// 코인 구매 함수
|
||||
/// </summary>
|
||||
/// <param name="amount">충전양</param>
|
||||
/// <param name="paymentId">결제ID(??)</param>
|
||||
/// <param name="paymentId">결제ID</param>
|
||||
/// <param name="paymentType">결제타입(카드,구글페이)</param>
|
||||
/// <param name="success"></param>
|
||||
/// <param name="failure"></param>
|
||||
@ -421,7 +393,6 @@ public class NetworkManager : Singleton<NetworkManager>
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.LogError("SID 값이 없습니다. 로그인 정보가 없습니다.");
|
||||
failure?.Invoke();
|
||||
yield break;
|
||||
}
|
||||
@ -430,7 +401,6 @@ public class NetworkManager : Singleton<NetworkManager>
|
||||
|
||||
if (www.result == UnityWebRequest.Result.ConnectionError || www.result == UnityWebRequest.Result.ProtocolError)
|
||||
{
|
||||
Debug.LogError("결제 요청 실패: " + www.error);
|
||||
failure?.Invoke();
|
||||
}
|
||||
else
|
||||
@ -440,8 +410,6 @@ public class NetworkManager : Singleton<NetworkManager>
|
||||
|
||||
if (purchaseResult.result == "SUCCESS")
|
||||
{
|
||||
Debug.Log($"결제 완료 {purchaseResult.purchased} 코인 충전됨, 현재 코인: {purchaseResult.currentCoins}");
|
||||
|
||||
// 유저 데이터 갱신
|
||||
UserManager.Instance.SetCoinsInfo();
|
||||
|
||||
@ -450,7 +418,6 @@ public class NetworkManager : Singleton<NetworkManager>
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.LogError("결제 후 코인 충전 실패: " + purchaseResult.result);
|
||||
failure?.Invoke();
|
||||
}
|
||||
}
|
||||
@ -482,7 +449,6 @@ public class NetworkManager : Singleton<NetworkManager>
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.LogError("SID 값이 없습니다. 로그인 정보가 없습니다.");
|
||||
failure?.Invoke("LOGIN_REQUIRED");
|
||||
yield break;
|
||||
}
|
||||
@ -492,8 +458,6 @@ public class NetworkManager : Singleton<NetworkManager>
|
||||
if (www.result == UnityWebRequest.Result.ConnectionError ||
|
||||
www.result == UnityWebRequest.Result.ProtocolError)
|
||||
{
|
||||
Debug.LogError("코인 차감 실패: " + www.error);
|
||||
|
||||
if (www.responseCode == 400)
|
||||
{
|
||||
failure?.Invoke("INSUFFICIENT_COINS");
|
||||
@ -510,13 +474,11 @@ public class NetworkManager : Singleton<NetworkManager>
|
||||
|
||||
if (deductResult.result == "SUCCESS")
|
||||
{
|
||||
Debug.Log("코인 차감 완료: " + deductResult.deducted);
|
||||
UserManager.Instance.SetCoinsInfo();
|
||||
success?.Invoke(deductResult.deducted);
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.LogError("코인 차감 실패: " + deductResult.result);
|
||||
failure?.Invoke(deductResult.result);
|
||||
}
|
||||
}
|
||||
@ -527,6 +489,7 @@ public class NetworkManager : Singleton<NetworkManager>
|
||||
{
|
||||
StartCoroutine(UpdateScoreCoroutine(isWin, success, failure));
|
||||
}
|
||||
|
||||
public IEnumerator UpdateScoreCoroutine(int isWin, Action<ScoreInfoResult> success, Action failure)
|
||||
{
|
||||
string jsonString = "{\"isWin\": "+isWin.ToString() + "}";
|
||||
@ -546,7 +509,6 @@ public class NetworkManager : Singleton<NetworkManager>
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.LogError("SID 값이 없습니다. 로그인 정보가 없습니다.");
|
||||
GameManager.Instance.panelManager.OpenConfirmPanel("SID 값이 없습니다. 로그인 정보가 없습니다.", () =>
|
||||
{
|
||||
failure?.Invoke();
|
||||
@ -559,7 +521,6 @@ public class NetworkManager : Singleton<NetworkManager>
|
||||
if (www.result == UnityWebRequest.Result.ConnectionError ||
|
||||
www.result == UnityWebRequest.Result.ProtocolError)
|
||||
{
|
||||
Debug.LogError("Error: " + www.error);
|
||||
failure?.Invoke();
|
||||
}
|
||||
else
|
||||
@ -571,5 +532,4 @@ public class NetworkManager : Singleton<NetworkManager>
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
@ -21,11 +21,6 @@ public abstract class EffectController : MonoBehaviour, IPointerClickHandler
|
||||
public delegate void OnEffectPanelEnded();
|
||||
protected OnEffectPanelEnded onEffectPanelEnded;
|
||||
|
||||
// protected virtual void Start()
|
||||
// {
|
||||
// ShowEffect();
|
||||
// }
|
||||
|
||||
// 효과를 실행하는 메서드 (자식이 구현해야 함)
|
||||
public abstract void ShowEffect([CanBeNull] OnEffectPanelEnded onEffectPanelEnded);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user