로비 UI세팅, 스테이지 씬 전환 및 플레이 연결
This commit is contained in:
villaingames
parent
babf7c2cd4
commit
bbdf5ac90c
|
|
@ -32,6 +32,31 @@ MonoBehaviour:
|
|||
m_ReadOnly: 0
|
||||
m_SerializedLabels: []
|
||||
FlaggedDuringContentUpdateRestriction: 0
|
||||
- m_GUID: c650c17ca1e3596449e012da25c3abfb
|
||||
m_Address: UIPanelLobby
|
||||
m_ReadOnly: 0
|
||||
m_SerializedLabels: []
|
||||
FlaggedDuringContentUpdateRestriction: 0
|
||||
- m_GUID: 2daafc1be0043ef49bddd1095741c34c
|
||||
m_Address: Lobby_Cop
|
||||
m_ReadOnly: 0
|
||||
m_SerializedLabels: []
|
||||
FlaggedDuringContentUpdateRestriction: 0
|
||||
- m_GUID: a1fe2133289ddb445ac88f9f02e4520d
|
||||
m_Address: Lobby_Cowboy
|
||||
m_ReadOnly: 0
|
||||
m_SerializedLabels: []
|
||||
FlaggedDuringContentUpdateRestriction: 0
|
||||
- m_GUID: 3cb4d160757c9214fbf30344b2818c3a
|
||||
m_Address: Lobby_Female01
|
||||
m_ReadOnly: 0
|
||||
m_SerializedLabels: []
|
||||
FlaggedDuringContentUpdateRestriction: 0
|
||||
- m_GUID: d8f31a905c882e8448d6854c3223b2a3
|
||||
m_Address: Lobby_Female02
|
||||
m_ReadOnly: 0
|
||||
m_SerializedLabels: []
|
||||
FlaggedDuringContentUpdateRestriction: 0
|
||||
m_ReadOnly: 0
|
||||
m_Settings: {fileID: 11400000, guid: a27fd004fb823a34a9ae690bdbfd496e, type: 2}
|
||||
m_SchemaSet:
|
||||
|
|
|
|||
117
Assets/AddressableResources/Characters/Prefabs/Lobby_Cop.prefab
Normal file
117
Assets/AddressableResources/Characters/Prefabs/Lobby_Cop.prefab
Normal file
|
|
@ -0,0 +1,117 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &9183878442997009333
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 9185467096088431885}
|
||||
- component: {fileID: 9151583754428987945}
|
||||
- component: {fileID: 9161262214850749213}
|
||||
m_Layer: 5
|
||||
m_Name: Model
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &9185467096088431885
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9183878442997009333}
|
||||
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: 7365553214411513303}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!33 &9151583754428987945
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9183878442997009333}
|
||||
m_Mesh: {fileID: 4300000, guid: dbdbaea0ed69fe34094b2571ffc58cce, type: 3}
|
||||
--- !u!23 &9161262214850749213
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9183878442997009333}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: dd41db2cdb4e66e4985303e1287ab101, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!1 &9215673432559229180
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7365553214411513303}
|
||||
m_Layer: 5
|
||||
m_Name: Lobby_Cop
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &7365553214411513303
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9215673432559229180}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 9185467096088431885}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 2daafc1be0043ef49bddd1095741c34c
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,117 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &9183878442997009333
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 9185467096088431885}
|
||||
- component: {fileID: 9151583754428987945}
|
||||
- component: {fileID: 9161262214850749213}
|
||||
m_Layer: 5
|
||||
m_Name: Model
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &9185467096088431885
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9183878442997009333}
|
||||
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: 7365553214411513303}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!33 &9151583754428987945
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9183878442997009333}
|
||||
m_Mesh: {fileID: 4300000, guid: 5892ed2d4b009744faa32a65b583bb78, type: 3}
|
||||
--- !u!23 &9161262214850749213
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9183878442997009333}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: dd41db2cdb4e66e4985303e1287ab101, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!1 &9215673432559229180
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7365553214411513303}
|
||||
m_Layer: 5
|
||||
m_Name: Lobby_Cowboy
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &7365553214411513303
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9215673432559229180}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 9185467096088431885}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: a1fe2133289ddb445ac88f9f02e4520d
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,117 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &9183878442997009333
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 9185467096088431885}
|
||||
- component: {fileID: 9151583754428987945}
|
||||
- component: {fileID: 9161262214850749213}
|
||||
m_Layer: 5
|
||||
m_Name: Model
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &9185467096088431885
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9183878442997009333}
|
||||
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: 7365553214411513303}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!33 &9151583754428987945
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9183878442997009333}
|
||||
m_Mesh: {fileID: 4300000, guid: 9d5abba0f4853a943a21871b74ab5377, type: 3}
|
||||
--- !u!23 &9161262214850749213
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9183878442997009333}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: dd41db2cdb4e66e4985303e1287ab101, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!1 &9215673432559229180
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7365553214411513303}
|
||||
m_Layer: 5
|
||||
m_Name: Lobby_Female01
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &7365553214411513303
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9215673432559229180}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 9185467096088431885}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 3cb4d160757c9214fbf30344b2818c3a
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,117 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &9183878442997009333
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 9185467096088431885}
|
||||
- component: {fileID: 9151583754428987945}
|
||||
- component: {fileID: 9161262214850749213}
|
||||
m_Layer: 5
|
||||
m_Name: Model
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &9185467096088431885
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9183878442997009333}
|
||||
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: 7365553214411513303}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!33 &9151583754428987945
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9183878442997009333}
|
||||
m_Mesh: {fileID: 4300000, guid: 3b0a250ecc6d88c4c9ce701273f864ba, type: 3}
|
||||
--- !u!23 &9161262214850749213
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9183878442997009333}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: dd41db2cdb4e66e4985303e1287ab101, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!1 &9215673432559229180
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7365553214411513303}
|
||||
m_Layer: 5
|
||||
m_Name: Lobby_Female02
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &7365553214411513303
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9215673432559229180}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 9185467096088431885}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d8f31a905c882e8448d6854c3223b2a3
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -61,7 +61,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 8626813278691054619}
|
||||
- component: {fileID: 8295369173337790907}
|
||||
- component: {fileID: 6524233524144987831}
|
||||
- component: {fileID: 6745683745341634570}
|
||||
m_Layer: 0
|
||||
m_Name: PlayerCam
|
||||
|
|
@ -136,14 +135,6 @@ Camera:
|
|||
m_OcclusionCulling: 1
|
||||
m_StereoConvergence: 10
|
||||
m_StereoSeparation: 0.022
|
||||
--- !u!81 &6524233524144987831
|
||||
AudioListener:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5683023600944451917}
|
||||
m_Enabled: 1
|
||||
--- !u!114 &6745683745341634570
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -576,6 +567,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_minigameController: {fileID: 2780159524716559223}
|
||||
_characterRenderer: {fileID: 9161262214850749213}
|
||||
_playerCam: {fileID: 8295369173337790907}
|
||||
--- !u!143 &1319893631350053148
|
||||
CharacterController:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -61,7 +61,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 8626813278691054619}
|
||||
- component: {fileID: 8295369173337790907}
|
||||
- component: {fileID: 6524233524144987831}
|
||||
- component: {fileID: 6745683745341634570}
|
||||
m_Layer: 0
|
||||
m_Name: PlayerCam
|
||||
|
|
@ -136,14 +135,6 @@ Camera:
|
|||
m_OcclusionCulling: 1
|
||||
m_StereoConvergence: 10
|
||||
m_StereoSeparation: 0.022
|
||||
--- !u!81 &6524233524144987831
|
||||
AudioListener:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5683023600944451917}
|
||||
m_Enabled: 1
|
||||
--- !u!114 &6745683745341634570
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -576,6 +567,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_minigameController: {fileID: 2780159524716559223}
|
||||
_characterRenderer: {fileID: 9161262214850749213}
|
||||
_playerCam: {fileID: 8295369173337790907}
|
||||
--- !u!143 &1319893631350053148
|
||||
CharacterController:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -61,7 +61,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 8626813278691054619}
|
||||
- component: {fileID: 8295369173337790907}
|
||||
- component: {fileID: 6524233524144987831}
|
||||
- component: {fileID: 6745683745341634570}
|
||||
m_Layer: 0
|
||||
m_Name: PlayerCam
|
||||
|
|
@ -136,14 +135,6 @@ Camera:
|
|||
m_OcclusionCulling: 1
|
||||
m_StereoConvergence: 10
|
||||
m_StereoSeparation: 0.022
|
||||
--- !u!81 &6524233524144987831
|
||||
AudioListener:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5683023600944451917}
|
||||
m_Enabled: 1
|
||||
--- !u!114 &6745683745341634570
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -576,6 +567,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_minigameController: {fileID: 2780159524716559223}
|
||||
_characterRenderer: {fileID: 9161262214850749213}
|
||||
_playerCam: {fileID: 8295369173337790907}
|
||||
--- !u!143 &1319893631350053148
|
||||
CharacterController:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -61,7 +61,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 8626813278691054619}
|
||||
- component: {fileID: 8295369173337790907}
|
||||
- component: {fileID: 6524233524144987831}
|
||||
- component: {fileID: 6745683745341634570}
|
||||
m_Layer: 0
|
||||
m_Name: PlayerCam
|
||||
|
|
@ -136,14 +135,6 @@ Camera:
|
|||
m_OcclusionCulling: 1
|
||||
m_StereoConvergence: 10
|
||||
m_StereoSeparation: 0.022
|
||||
--- !u!81 &6524233524144987831
|
||||
AudioListener:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5683023600944451917}
|
||||
m_Enabled: 1
|
||||
--- !u!114 &6745683745341634570
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -576,6 +567,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_minigameController: {fileID: 2780159524716559223}
|
||||
_characterRenderer: {fileID: 9161262214850749213}
|
||||
_playerCam: {fileID: 8295369173337790907}
|
||||
--- !u!143 &1319893631350053148
|
||||
CharacterController:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -5,28 +5,32 @@
|
|||
"Str": 2000,
|
||||
"Range": 2.0,
|
||||
"Speed": 3.0,
|
||||
"PrefabName": "Crate_01"
|
||||
"PrefabName": "Player_Cop",
|
||||
"UIPrefabName": "Lobby_Cop"
|
||||
},
|
||||
{
|
||||
"Id": 2,
|
||||
"Str": 2200,
|
||||
"Range": 2.5,
|
||||
"Speed": 2.5,
|
||||
"PrefabName": "Crate_02"
|
||||
"PrefabName": "Player_Cowboy",
|
||||
"UIPrefabName": "Lobby_Cowboy"
|
||||
},
|
||||
{
|
||||
"Id": 3,
|
||||
"Str": 1800,
|
||||
"Range": 2.8,
|
||||
"Speed": 2.5,
|
||||
"PrefabName": "Crate_03"
|
||||
"PrefabName": "Player_Female01",
|
||||
"UIPrefabName": "Lobby_Female01"
|
||||
},
|
||||
{
|
||||
"Id": 4,
|
||||
"Str": 1800,
|
||||
"Range": 2.5,
|
||||
"Speed": 2.8,
|
||||
"PrefabName": "Crate_04"
|
||||
"PrefabName": "Player_Female02",
|
||||
"UIPrefabName": "Lobby_Female02"
|
||||
}
|
||||
]
|
||||
}
|
||||
8
Assets/AddressableResources/UI/Lobby.meta
Normal file
8
Assets/AddressableResources/UI/Lobby.meta
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: a6a86144c211bc644af7d62bf1d75af5
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
52181
Assets/AddressableResources/UI/Lobby/UIPanelLobby.prefab
Normal file
52181
Assets/AddressableResources/UI/Lobby/UIPanelLobby.prefab
Normal file
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: c650c17ca1e3596449e012da25c3abfb
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -244,7 +244,6 @@ RectTransform:
|
|||
- {fileID: 464527244304508452}
|
||||
- {fileID: 5379975910663852649}
|
||||
- {fileID: 4206944545761638103}
|
||||
- {fileID: 7937049023102138502}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
|
|
@ -272,6 +271,9 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 6106d35441c5cb34c82b37eea1a15671, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_settingButton: {fileID: 4206944545761638098}
|
||||
_spawnTimer: {fileID: 470785271292392503}
|
||||
_playTimer: {fileID: 5196473190348363001}
|
||||
--- !u!1 &1998614922332527177
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -693,140 +695,6 @@ MonoBehaviour:
|
|||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &4754792544485351219
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1402426527389985338}
|
||||
- component: {fileID: 3360222321523538565}
|
||||
- component: {fileID: 5778710400565776824}
|
||||
m_Layer: 5
|
||||
m_Name: Text (TMP)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1402426527389985338
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4754792544485351219}
|
||||
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: 7937049023102138502}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3360222321523538565
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4754792544485351219}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &5778710400565776824
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4754792544485351219}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: Button
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4281479730
|
||||
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
topRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_fontColorGradientPreset: {fileID: 0}
|
||||
m_spriteAsset: {fileID: 0}
|
||||
m_tintAllSprites: 0
|
||||
m_StyleSheet: {fileID: 0}
|
||||
m_TextStyleHashCode: -1183493901
|
||||
m_overrideHtmlColors: 0
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 24
|
||||
m_fontSizeBase: 24
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 2
|
||||
m_VerticalAlignment: 512
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
m_enableWordWrapping: 1
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 0
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 1
|
||||
m_enableExtraPadding: 0
|
||||
checkPaddingRequired: 0
|
||||
m_isRichText: 1
|
||||
m_parseCtrlCharacters: 1
|
||||
m_isOrthographic: 1
|
||||
m_isCullingEnabled: 0
|
||||
m_horizontalMapping: 0
|
||||
m_verticalMapping: 0
|
||||
m_uvLineOffset: 0
|
||||
m_geometrySortingOrder: 0
|
||||
m_IsTextObjectScaleStatic: 0
|
||||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1 &4983225572639618748
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1127,139 +995,6 @@ MonoBehaviour:
|
|||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &7118712054142439156
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7937049023102138502}
|
||||
- component: {fileID: 8491409205708898254}
|
||||
- component: {fileID: 4195759523900183495}
|
||||
- component: {fileID: 6398261241655515307}
|
||||
m_Layer: 5
|
||||
m_Name: Button
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7937049023102138502
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7118712054142439156}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1402426527389985338}
|
||||
m_Father: {fileID: 8219280034645439265}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 163}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8491409205708898254
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7118712054142439156}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &4195759523900183495
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7118712054142439156}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &6398261241655515307
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7118712054142439156}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_WrapAround: 0
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 4195759523900183495}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 801803690553345261}
|
||||
m_TargetAssemblyTypeName: UIPanelStage, Assembly-CSharp
|
||||
m_MethodName: Test
|
||||
m_Mode: 1
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
--- !u!1001 &3420046219153846293
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1376,7 +1111,7 @@ PrefabInstance:
|
|||
- target: {fileID: 1518944720451438279, guid: 4ec798a481bf945e5936c4cb72dd37a0,
|
||||
type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1518944720451438279, guid: 4ec798a481bf945e5936c4cb72dd37a0,
|
||||
type: 3}
|
||||
|
|
@ -1413,6 +1148,18 @@ PrefabInstance:
|
|||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 4ec798a481bf945e5936c4cb72dd37a0, type: 3}
|
||||
--- !u!114 &4206944545761638098 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 1518944720451438279, guid: 4ec798a481bf945e5936c4cb72dd37a0,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 3420046219153846293}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!224 &4206944545761638103 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 1518944720451438274, guid: 4ec798a481bf945e5936c4cb72dd37a0,
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ Camera:
|
|||
m_Depth: -1
|
||||
m_CullingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_Bits: 32
|
||||
m_RenderingPath: -1
|
||||
m_TargetTexture: {fileID: 0}
|
||||
m_TargetDisplay: 0
|
||||
|
|
@ -328,6 +328,37 @@ Transform:
|
|||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &487263115
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 487263116}
|
||||
m_Layer: 0
|
||||
m_Name: ObjectPool
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &487263116
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 487263115}
|
||||
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: 782420893}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &505893840
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -375,6 +406,52 @@ Transform:
|
|||
- {fileID: 231117064}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &782420891
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 782420893}
|
||||
- component: {fileID: 782420892}
|
||||
m_Layer: 0
|
||||
m_Name: AddressableManager
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &782420892
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 782420891}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 528ea493b25628140a45a535a5659aee, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_objectPoolRoot: {fileID: 487263116}
|
||||
--- !u!4 &782420893
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 782420891}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 487263116}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1177572992
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -635,3 +712,4 @@ SceneRoots:
|
|||
- {fileID: 412197490}
|
||||
- {fileID: 505893842}
|
||||
- {fileID: 1187408430}
|
||||
- {fileID: 782420893}
|
||||
|
|
|
|||
|
|
@ -2369,7 +2369,7 @@ Transform:
|
|||
m_GameObject: {fileID: 514824633}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -4.24, y: -2.6, z: -3.81}
|
||||
m_LocalPosition: {x: 5.98, y: -2.6, z: -4.86}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
|
|
@ -4366,6 +4366,59 @@ PrefabInstance:
|
|||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: d641786a4f8b77d449322a313a6ddecd, type: 3}
|
||||
--- !u!1 &852532917
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 852532919}
|
||||
- component: {fileID: 852532918}
|
||||
m_Layer: 0
|
||||
m_Name: GameObject
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!65 &852532918
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 852532917}
|
||||
m_Material: {fileID: 0}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_LayerOverridePriority: 0
|
||||
m_IsTrigger: 0
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Size: {x: 15, y: 1, z: 15}
|
||||
m_Center: {x: -6.5, y: 2, z: 18.5}
|
||||
--- !u!4 &852532919
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 852532917}
|
||||
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 &856320587
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -7248,10 +7301,10 @@ MonoBehaviour:
|
|||
_itemSpawnPosList: []
|
||||
_playerSpawnPos: {fileID: 514824634}
|
||||
_propGenerateArea:
|
||||
- m_Center: {x: 0.9, y: 2.8, z: 3.7}
|
||||
m_Extent: {x: 28.9, y: 0, z: 16.49}
|
||||
- m_Center: {x: 0.9, y: 2.8, z: 3.7}
|
||||
m_Extent: {x: 17.6, y: 0, z: 16.49}
|
||||
- m_Center: {x: 1, y: 2, z: 3}
|
||||
m_Extent: {x: 26, y: 1, z: 15}
|
||||
- m_Center: {x: -6.5, y: 2, z: 18.5}
|
||||
m_Extent: {x: 15, y: 1, z: 15}
|
||||
--- !u!4 &1339745045
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -12411,3 +12464,4 @@ SceneRoots:
|
|||
- {fileID: 514824634}
|
||||
- {fileID: 2058148467}
|
||||
- {fileID: 679879114}
|
||||
- {fileID: 852532919}
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ using UnityEngine.ResourceManagement.AsyncOperations;
|
|||
|
||||
public class AddressableManager : UnitySingleton<AddressableManager>
|
||||
{
|
||||
[SerializeField] private Transform _objectPoolRoot;
|
||||
private bool _collectionCheck = false;
|
||||
private int _maxPoolSize = 100;
|
||||
private Dictionary<string, ObjectPool<GameObject>> _objectPoolDict = new();
|
||||
|
|
@ -43,22 +44,14 @@ public class AddressableManager : UnitySingleton<AddressableManager>
|
|||
|
||||
return handle;
|
||||
}
|
||||
//public void InstantiateAsync(string name, Transform parent, Action<GameObject> onComplete)
|
||||
//{
|
||||
// var handle = Addressables.InstantiateAsync(name, parent);
|
||||
// handle.Completed += handler =>
|
||||
// {
|
||||
// onComplete(handle.Result);
|
||||
// Addressables.Release(handle);
|
||||
// };
|
||||
//}
|
||||
|
||||
|
||||
public void Spawn(string name, Transform parent, Action<GameObject> complete)
|
||||
{
|
||||
if(_objectPoolDict.ContainsKey(name))
|
||||
{
|
||||
var obj = _objectPoolDict[name].Get();
|
||||
obj.transform.parent = parent;
|
||||
obj.transform.parent = parent == null ? _objectPoolRoot : parent;
|
||||
complete(obj);
|
||||
return;
|
||||
}
|
||||
|
|
@ -67,7 +60,7 @@ public class AddressableManager : UnitySingleton<AddressableManager>
|
|||
{
|
||||
_objectPoolDict.Add(name, CreateNewObjectPool(OnComplete, name));
|
||||
var obj = _objectPoolDict[name].Get();
|
||||
obj.transform.parent = parent;
|
||||
obj.transform.parent = parent == null ? _objectPoolRoot : parent;
|
||||
complete(obj);
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ using UnityEngine;
|
|||
|
||||
public class PlayerInfo
|
||||
{
|
||||
public int Id { get { return _table.Id; } }
|
||||
public int STR { get { return _table.Str; } }
|
||||
public float RANGE { get { return _table.Range; } }
|
||||
public float SPEED { get { return _table.Speed; } }
|
||||
|
|
@ -13,6 +14,8 @@ public class PlayerInfo
|
|||
|
||||
public string PrefapName { get { return _table.PrefabName; } }
|
||||
|
||||
public string UIPrefabName { get { return _table.UIPrefabName; } }
|
||||
|
||||
private JPlayerData _table;
|
||||
|
||||
public PlayerInfo(JPlayerData data)
|
||||
|
|
|
|||
|
|
@ -24,5 +24,7 @@ namespace FirstVillain.Entities
|
|||
public float Speed;
|
||||
|
||||
public string PrefabName;
|
||||
|
||||
public string UIPrefabName;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ using UnityEngine;
|
|||
public static class Constants
|
||||
{
|
||||
public static readonly float PLAY_TIME = 60;
|
||||
public static readonly int PLAYER_SPAWN_TIME = 3;
|
||||
|
||||
//TODO : 마우스 감도 조절 등에 변경 가능한지 확인 필요
|
||||
public static readonly float CAM_TURN_SPEED = 40;
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@ public enum E_UI_TYPE
|
|||
UIPanelStage = 100,
|
||||
UIPanelIntro,
|
||||
UIPanelLoadingIntro,
|
||||
UIPanelLobby,
|
||||
}
|
||||
#endregion UI
|
||||
|
||||
|
|
|
|||
|
|
@ -6,13 +6,26 @@ using UnityEngine;
|
|||
|
||||
public class GameManager : UnitySingleton<GameManager>
|
||||
{
|
||||
public List<PlayerInfo> PlayerData { get; private set; } = new();
|
||||
public PlayerInfo MainPlayer
|
||||
{
|
||||
get
|
||||
{
|
||||
return PlayerPrefsManager.LoadMainPlayer();
|
||||
}
|
||||
}
|
||||
private List<PlayerInfo> _playerData = new();
|
||||
|
||||
public void SetPlayerData(List<JPlayerData> dataList)
|
||||
{
|
||||
foreach (var data in dataList)
|
||||
{
|
||||
PlayerData.Add(new PlayerInfo(data));
|
||||
_playerData.Add(new PlayerInfo(data));
|
||||
}
|
||||
}
|
||||
|
||||
public PlayerInfo GetPlayerData(int id)
|
||||
{
|
||||
return _playerData.Find(arg => arg.Id == id);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
19
Assets/Scripts/Manage/PlayerPrefsManager.cs
Normal file
19
Assets/Scripts/Manage/PlayerPrefsManager.cs
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public static class PlayerPrefsManager
|
||||
{
|
||||
private static readonly string KEY_MAIN_PLAYER = "MainPlayerKey";
|
||||
public static void SaveMainPlayer(int id)
|
||||
{
|
||||
PlayerPrefs.SetInt(KEY_MAIN_PLAYER, id);
|
||||
PlayerPrefs.Save();
|
||||
}
|
||||
|
||||
public static PlayerInfo LoadMainPlayer()
|
||||
{
|
||||
var id = PlayerPrefs.GetInt(KEY_MAIN_PLAYER, 1);
|
||||
return GameManager.Instance.GetPlayerData(id);
|
||||
}
|
||||
}
|
||||
11
Assets/Scripts/Manage/PlayerPrefsManager.cs.meta
Normal file
11
Assets/Scripts/Manage/PlayerPrefsManager.cs.meta
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 01cb29b40a8bfbb4582c0d5f361b76ac
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -15,13 +15,11 @@ public class IntroSceneController : MonoBehaviour
|
|||
{
|
||||
UIManager.Instance.OpenUI(E_UI_TYPE.UIPanelIntro);
|
||||
EventBus.Instance.Subscribe<EventLoadAssets>(OnStartLoadAssets);
|
||||
//EventBus.Instance.Subscribe<EventLoadTable<JPlayerData>>(OnPlayerDataLoaded);
|
||||
}
|
||||
|
||||
private void OnDestroy()
|
||||
{
|
||||
EventBus.Instance.Unsubscribe<EventLoadAssets>(OnStartLoadAssets);
|
||||
//EventBus.Instance.Unsubscribe<EventLoadTable<JPlayerData>>(OnPlayerDataLoaded);
|
||||
}
|
||||
|
||||
private void OnStartLoadAssets(EventLoadAssets e)
|
||||
|
|
@ -56,6 +54,7 @@ public class IntroSceneController : MonoBehaviour
|
|||
private void OnPlayerDataLoaded(Wrapper<JPlayerData> data)
|
||||
{
|
||||
//µ¥ÀÌÅÍ ¼¼ÆÃ
|
||||
//아직 서버는 고려하지 않는다.
|
||||
GameManager.Instance.SetPlayerData(data.list);
|
||||
_loadedTableCount++;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ public class LobbySceneController : MonoBehaviour
|
|||
private void OnStartLobby(EventStartLobby e)
|
||||
{
|
||||
//로비 UI Open
|
||||
UIManager.Instance.OpenUI(E_UI_TYPE.UIPanelStage, OnLobbyUIOpened);
|
||||
UIManager.Instance.OpenUI(E_UI_TYPE.UIPanelLobby, OnLobbyUIOpened);
|
||||
}
|
||||
|
||||
private void OnLobbyUIOpened(UIBase lobbyUI)
|
||||
|
|
|
|||
|
|
@ -5,18 +5,45 @@ using UnityEngine;
|
|||
|
||||
public class SingleStageSceneController : MonoBehaviour
|
||||
{
|
||||
private void Start()
|
||||
private UIPanelStage _stageUI;
|
||||
private void Awake()
|
||||
{
|
||||
EventBus.Instance.Subscribe<EventStartStage>(OnStartStage);
|
||||
EventBus.Instance.Subscribe<EventSpawnTimer>(OnUpdateSapwnTimer);
|
||||
EventBus.Instance.Subscribe<EventStartGame>(OnStartGame);
|
||||
EventBus.Instance.Subscribe<EventPlayTimer>(OnUpdatePlayTimer);
|
||||
}
|
||||
|
||||
private void OnDestroy()
|
||||
{
|
||||
EventBus.Instance.Unsubscribe<EventStartStage>(OnStartStage);
|
||||
EventBus.Instance.Unsubscribe<EventSpawnTimer>(OnUpdateSapwnTimer);
|
||||
EventBus.Instance.Unsubscribe<EventStartGame>(OnStartGame);
|
||||
EventBus.Instance.Unsubscribe<EventPlayTimer>(OnUpdatePlayTimer);
|
||||
}
|
||||
|
||||
private void OnStartStage(EventStartStage e)
|
||||
{
|
||||
//UI »ý¼º
|
||||
UIManager.Instance.OpenUI(E_UI_TYPE.UIPanelStage, stageUI =>
|
||||
{
|
||||
_stageUI = stageUI as UIPanelStage;
|
||||
StageManager.Instance.Init(e.SelectedPlayer, e.StageType);
|
||||
});
|
||||
}
|
||||
|
||||
private void OnUpdateSapwnTimer(EventSpawnTimer e)
|
||||
{
|
||||
_stageUI.UpdateSpawnTimer(e.Timer);
|
||||
}
|
||||
|
||||
private void OnStartGame(EventStartGame e)
|
||||
{
|
||||
StageManager.Instance.StartGame();
|
||||
}
|
||||
|
||||
private void OnUpdatePlayTimer(EventPlayTimer e)
|
||||
{
|
||||
_stageUI.UpdatePlayTimer(e.Timer);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using System;
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Rendering.Universal;
|
||||
|
||||
public class UIManager : UnitySingleton<UIManager>
|
||||
{
|
||||
|
|
@ -142,8 +143,10 @@ public class UIManager : UnitySingleton<UIManager>
|
|||
{
|
||||
return;
|
||||
}
|
||||
StartCoroutine(DelayCloseLoading());
|
||||
|
||||
//StartCoroutine(DelayCloseLoading());
|
||||
_loadingUI.CloseAction();
|
||||
Destroy(_loadingUI.gameObject);
|
||||
_loadingUI = null;
|
||||
}
|
||||
private IEnumerator DelayCloseLoading()
|
||||
{
|
||||
|
|
@ -168,4 +171,17 @@ public class UIManager : UnitySingleton<UIManager>
|
|||
}
|
||||
_systemUIList = new();
|
||||
}
|
||||
|
||||
public Camera GetUICam()
|
||||
{
|
||||
var uiCam = _uiCanvas.worldCamera;
|
||||
uiCam.GetUniversalAdditionalCameraData().renderType = CameraRenderType.Overlay;
|
||||
return uiCam;
|
||||
}
|
||||
|
||||
public void ResetUICam()
|
||||
{
|
||||
var uiCam = _uiCanvas.worldCamera;
|
||||
uiCam.GetUniversalAdditionalCameraData().renderType = CameraRenderType.Base;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,13 @@ using FirstVillain.EventBus;
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Rendering.Universal;
|
||||
|
||||
public class PlayerController : MonoBehaviour
|
||||
{
|
||||
[SerializeField] private MinigameController _minigameController;
|
||||
[SerializeField] private Renderer _characterRenderer;
|
||||
[SerializeField] private Camera _playerCam;
|
||||
private bool _isPushed = false;
|
||||
|
||||
private PlayerMove _playerMove;
|
||||
|
|
@ -28,6 +30,9 @@ public class PlayerController : MonoBehaviour
|
|||
|
||||
public void SetData(PlayerInfo info)
|
||||
{
|
||||
var camData = _playerCam.GetUniversalAdditionalCameraData();
|
||||
camData.cameraStack.Add(UIManager.Instance.GetUICam());
|
||||
|
||||
_tableData = info;
|
||||
//_currentTeam = info.Team;
|
||||
_currentTeam = E_TEAM.Red;
|
||||
|
|
|
|||
|
|
@ -30,30 +30,35 @@ public class SpawnController : MonoBehaviour
|
|||
//TODO : 씬 외부에서 선택된 플레이어 정보를 넘겨주고 해당 데이터를 받아 생성한다.
|
||||
public void SpawnPlayer(PlayerInfo info, System.Action<PlayerController> result)
|
||||
{
|
||||
TableManager.Instance.GetPropInfoList(E_TABLE.JPropInfo, propList =>
|
||||
{
|
||||
_PropDataList = propList;
|
||||
AddressableManager.Instance.Spawn(info.PrefapName, null, onComplete =>
|
||||
{
|
||||
var controller = onComplete.GetComponent<PlayerController>();
|
||||
controller.SetData(info);
|
||||
controller.Block();
|
||||
RespawnPlayer(controller);
|
||||
RespawnPlayer(controller, true);
|
||||
result(controller);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
public void RespawnPlayer(PlayerController player)
|
||||
public void SpawnProps()
|
||||
{
|
||||
TableManager.Instance.GetPropInfoList(E_TABLE.JPropInfo, propList =>
|
||||
{
|
||||
_PropDataList = propList;
|
||||
StartSpawnProp();
|
||||
});
|
||||
}
|
||||
|
||||
public void RespawnPlayer(PlayerController player, bool isStart = false)
|
||||
{
|
||||
player.transform.position = _playerSpawnPos.position;
|
||||
player.transform.rotation = _playerSpawnPos.rotation;
|
||||
|
||||
StartCoroutine(RespawnDelay(player));
|
||||
StartCoroutine(RespawnDelay(player, isStart));
|
||||
}
|
||||
|
||||
//타입별로 만들어야 할까..?
|
||||
public void StartSpawnProp()
|
||||
private void StartSpawnProp()
|
||||
{
|
||||
StartCoroutine(SpawnPropsCoroutine());
|
||||
}
|
||||
|
|
@ -101,11 +106,22 @@ public class SpawnController : MonoBehaviour
|
|||
_curPropCount--;
|
||||
}
|
||||
|
||||
private IEnumerator RespawnDelay(PlayerController controller)
|
||||
private IEnumerator RespawnDelay(PlayerController controller, bool isStart)
|
||||
{
|
||||
//TODO : UI에 재생성 시간 표기
|
||||
yield return new WaitForSeconds(3f);
|
||||
int timer = Constants.PLAYER_SPAWN_TIME;
|
||||
|
||||
var sec = new WaitForSeconds(1f);
|
||||
while (timer >= 0)
|
||||
{
|
||||
EventBus.Instance.Publish(new EventSpawnTimer(timer));
|
||||
timer--;
|
||||
yield return sec;
|
||||
}
|
||||
|
||||
controller.Respawn();
|
||||
if (isStart)
|
||||
{
|
||||
EventBus.Instance.Publish(new EventStartGame());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,3 +31,28 @@ public class EventPropRemoved : EventBase
|
|||
{
|
||||
|
||||
}
|
||||
|
||||
public class EventSpawnTimer : EventBase
|
||||
{
|
||||
public int Timer { get; private set; }
|
||||
|
||||
public EventSpawnTimer(int timer)
|
||||
{
|
||||
Timer = timer;
|
||||
}
|
||||
}
|
||||
|
||||
public class EventStartGame : EventBase
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public class EventPlayTimer : EventBase
|
||||
{
|
||||
public int Timer { get; private set; }
|
||||
|
||||
public EventPlayTimer(int timer)
|
||||
{
|
||||
Timer = timer;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
using FirstVillain.Entities;
|
||||
using FirstVillain.EventBus;
|
||||
using FirstVillain.Singleton;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
|
|
@ -16,17 +17,18 @@ public class StageManager : UnitySingletonOnce<StageManager>
|
|||
|
||||
public bool IsPlaying { get { return _state == E_STAGE_STATE.Playing; } }
|
||||
|
||||
private void Init(PlayerInfo player, E_STAGE_TYPE type)
|
||||
public void Init(PlayerInfo player, E_STAGE_TYPE type)
|
||||
{
|
||||
|
||||
_currentStageType = type;
|
||||
_state = E_STAGE_STATE.Ready;
|
||||
InitScore();
|
||||
//TODO : UIÃʱâÈ
|
||||
_spawnController.SpawnProps();
|
||||
_spawnController.SpawnPlayer(player, result =>
|
||||
{
|
||||
//시작 시간표기?
|
||||
StartGame();
|
||||
_state = E_STAGE_STATE.Playing;
|
||||
_currentPlayer = result;
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -43,9 +45,8 @@ public class StageManager : UnitySingletonOnce<StageManager>
|
|||
|
||||
public void StartGame()
|
||||
{
|
||||
_state = E_STAGE_STATE.Playing;
|
||||
StartCoroutine(PlayTimer(Constants.PLAY_TIME));
|
||||
_spawnController.StartSpawnProp();
|
||||
|
||||
StartCoroutine(PlayTimer());
|
||||
}
|
||||
|
||||
public void UpdateScore(E_TEAM team, int score)
|
||||
|
|
@ -67,22 +68,25 @@ public class StageManager : UnitySingletonOnce<StageManager>
|
|||
public void GameOver()
|
||||
{
|
||||
_state = E_STAGE_STATE.End;
|
||||
Debug.Log("Game Over");
|
||||
//°ÔÀÓ Á¾·á UI È£Ãâ
|
||||
}
|
||||
|
||||
#region Timer
|
||||
private IEnumerator PlayTimer(float time)
|
||||
private IEnumerator PlayTimer()
|
||||
{
|
||||
float timer = 0;
|
||||
float timer = Constants.PLAY_TIME;
|
||||
int sec = (int)Constants.PLAY_TIME;
|
||||
float secTimer = 0;
|
||||
while(timer < time)
|
||||
while(timer > 0)
|
||||
{
|
||||
timer += Time.deltaTime;
|
||||
timer -= Time.deltaTime;
|
||||
secTimer += Time.deltaTime;
|
||||
if(secTimer >= 1f)
|
||||
{
|
||||
secTimer = 0;
|
||||
//UI에 표기 시간 감소(초)
|
||||
sec--;
|
||||
EventBus.Instance.Publish(new EventPlayTimer(sec));
|
||||
}
|
||||
yield return null;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,4 +11,11 @@ public static class Extentions
|
|||
button.onClick.RemoveAllListeners();
|
||||
button.onClick.AddListener(callback);
|
||||
}
|
||||
|
||||
public static void ResetTransform(this GameObject obj)
|
||||
{
|
||||
obj.transform.position = Vector3.zero;
|
||||
obj.transform.localScale = Vector3.one;
|
||||
obj.transform.localRotation = Quaternion.identity;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
8
Assets/Scripts/UI/Lobby.meta
Normal file
8
Assets/Scripts/UI/Lobby.meta
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 4db535c0fb3cf334b98eed6f898db5f8
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
41
Assets/Scripts/UI/Lobby/UIPanelLobby.cs
Normal file
41
Assets/Scripts/UI/Lobby/UIPanelLobby.cs
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
using FirstVillain.EventBus;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class UIPanelLobby : UIBase
|
||||
{
|
||||
[SerializeField] private Transform _characterRoot;
|
||||
|
||||
[SerializeField] private Button _singleStageButton;
|
||||
|
||||
|
||||
public override void Open()
|
||||
{
|
||||
InitButtons();
|
||||
var main = GameManager.Instance.MainPlayer.UIPrefabName;
|
||||
AddressableManager.Instance.Spawn(main, _characterRoot, onComplete =>
|
||||
{
|
||||
onComplete.SetActive(false);
|
||||
onComplete.ResetTransform();
|
||||
base.Open();
|
||||
UIManager.Instance.CloseLoadingUI();
|
||||
onComplete.SetActive(true);
|
||||
});
|
||||
}
|
||||
|
||||
private void InitButtons()
|
||||
{
|
||||
_singleStageButton.AddButtonListener(OnClickSingleStage);
|
||||
}
|
||||
|
||||
private void OnClickSingleStage()
|
||||
{
|
||||
SceneLoadManager.Instance.LoadSceneAsync("Stage_Single", UnityEngine.SceneManagement.LoadSceneMode.Single, OnLoadSingleStageComplete);
|
||||
}
|
||||
private void OnLoadSingleStageComplete()
|
||||
{
|
||||
EventBus.Instance.Publish(new EventStartStage(GameManager.Instance.MainPlayer, E_STAGE_TYPE.Single_TimeAttack));
|
||||
}
|
||||
}
|
||||
11
Assets/Scripts/UI/Lobby/UIPanelLobby.cs.meta
Normal file
11
Assets/Scripts/UI/Lobby/UIPanelLobby.cs.meta
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 80131321431d65444b10f04d6c32d9ec
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -1,11 +1,19 @@
|
|||
using FirstVillain.EventBus;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class UIPanelStage : UIBase
|
||||
{
|
||||
[SerializeField] private Button _settingButton;
|
||||
[SerializeField] private TextMeshProUGUI _spawnTimer;
|
||||
[SerializeField] private TextMeshProUGUI _playTimer;
|
||||
public override void Open()
|
||||
{
|
||||
_spawnTimer.text = string.Empty;
|
||||
UpdatePlayTimer((int)Constants.PLAY_TIME);
|
||||
base.Open();
|
||||
}
|
||||
|
||||
|
|
@ -14,8 +22,25 @@ public class UIPanelStage : UIBase
|
|||
base.CloseAction();
|
||||
}
|
||||
|
||||
public void Test()
|
||||
public void UpdatePlayTimer(int time)
|
||||
{
|
||||
UIManager.Instance.OpenUI(E_UI_TYPE.UIPanelStage);
|
||||
_playTimer.text = $"{time / 60} : {string.Format("{0:00}", time % 60)}";
|
||||
}
|
||||
|
||||
public void UpdateSpawnTimer(int time)
|
||||
{
|
||||
string timeValue = time.ToString();
|
||||
if(time == 0)
|
||||
{
|
||||
timeValue = "START";
|
||||
StartCoroutine(DelayCloseStart());
|
||||
}
|
||||
_spawnTimer.text = timeValue;
|
||||
}
|
||||
|
||||
private IEnumerator DelayCloseStart()
|
||||
{
|
||||
yield return new WaitForSeconds(.5f);
|
||||
_spawnTimer.text = string.Empty;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user