diff --git a/Assets/OneShotOneKill.txt b/Assets/OneShotOneKill.txt index 27d10e0..243d382 100644 --- a/Assets/OneShotOneKill.txt +++ b/Assets/OneShotOneKill.txt @@ -1,2 +1,7 @@ -테이블 만들기 -몬스터 만들기 \ No newline at end of file +테이블 연결 +- 스테이지 +- 웨이브 +- 몬스터 +- 유닛 +- 몬스터 +- 투사체(이펙트) \ No newline at end of file diff --git a/Assets/ResWork/Prefab/Play_Ingame.prefab b/Assets/ResWork/Prefab/Play_Ingame.prefab index c9050e7..52653ab 100644 --- a/Assets/ResWork/Prefab/Play_Ingame.prefab +++ b/Assets/ResWork/Prefab/Play_Ingame.prefab @@ -156,9 +156,9 @@ RectTransform: - {fileID: 351787397619305960} m_Father: {fileID: 351787397931536801} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 84, y: -28} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 168, y: 56} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &351787396953488285 @@ -630,9 +630,9 @@ RectTransform: - {fileID: 351787398816937879} m_Father: {fileID: 351787397931536801} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 84, y: -124} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 168, y: 56} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &351787397989201314 @@ -1066,9 +1066,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6552677842084449146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 582.25, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 68.5, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7163430304694369180 @@ -1484,9 +1484,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6552677842084449146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 171.25, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 68.5, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7823538357930750549 @@ -1602,6 +1602,41 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1239104541908615461 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4345815656697021049} + m_Layer: 5 + m_Name: Mob + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4345815656697021049 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1239104541908615461} + 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: 4111377606588400904} + 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!1 &1548661960927891981 GameObject: m_ObjectHideFlags: 0 @@ -1634,9 +1669,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6552677842084449146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 239.75, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 68.5, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &435610639417173863 @@ -1778,9 +1813,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6552677842084449146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 376.75, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 68.5, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7600085844187918154 @@ -2003,9 +2038,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6552677842084449146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1061.75, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 68.5, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &169289265744140556 @@ -2313,9 +2348,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6552677842084449146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 34.25, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 68.5, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7400539125868673273 @@ -2388,9 +2423,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6552677842084449146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 924.75, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 68.5, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6648869032753469536 @@ -2751,9 +2786,9 @@ RectTransform: - {fileID: 4111377605186515536} m_Father: {fileID: 4111377605869284182} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 74.985, y: -738} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 150.03, y: 149.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4111377604873454818 @@ -2978,9 +3013,9 @@ RectTransform: - {fileID: 4111377606575878288} m_Father: {fileID: 4111377605869284182} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 74.985, y: -246} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 150.03, y: 149.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4111377605057742994 @@ -3206,9 +3241,9 @@ RectTransform: - {fileID: 4111377605378486164} m_Father: {fileID: 4111377605869284182} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 74.985, y: -82} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 150.03, y: 149.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4111377605223402643 @@ -3572,9 +3607,9 @@ RectTransform: - {fileID: 4111377606218893651} m_Father: {fileID: 4111377605869284182} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 74.985, y: -574} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 150.03, y: 149.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4111377605604120004 @@ -4534,7 +4569,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 80} + m_AnchoredPosition: {x: 0, y: 80.00012} m_SizeDelta: {x: 400, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4111377606414902198 @@ -4721,13 +4756,14 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4111377606588400904} + - component: {fileID: 6233565954278996248} m_Layer: 5 m_Name: Play_Ingame m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4111377606588400904 RectTransform: m_ObjectHideFlags: 0 @@ -4742,6 +4778,7 @@ RectTransform: m_Children: - {fileID: 4111377605235060811} - {fileID: 8406924210966255483} + - {fileID: 4345815656697021049} - {fileID: 5061678075927086196} - {fileID: 4111377606315435504} - {fileID: 4111377605452252100} @@ -4761,6 +4798,27 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &6233565954278996248 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4111377606588400911} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5d5c7d7015715f149a39eab8276626c3, type: 3} + m_Name: + m_EditorClassIdentifier: + texts_money: + - {fileID: 351787397619305963} + - {fileID: 351787398816937878} + - {fileID: 4111377606414902197} + t_timer: {fileID: 7991392133282040855} + t_hp: {fileID: 532538376354378446} + t_exp: {fileID: 3128129788876480378} + slider_wave: {fileID: 926598497707837271} + slider_exp: {fileID: 4111377606193493323} --- !u!1 &4111377606590957781 GameObject: m_ObjectHideFlags: 0 @@ -4931,7 +4989,7 @@ RectTransform: m_Father: {fileID: 4111377606625657608} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.426, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -5043,9 +5101,9 @@ RectTransform: - {fileID: 4111377606184979533} m_Father: {fileID: 4111377605869284182} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 74.985, y: -410} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 150.03, y: 149.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4111377606646784703 @@ -5943,9 +6001,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6552677842084449146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 787.75, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 68.5, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6536984518647531088 @@ -6168,9 +6226,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6552677842084449146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 308.25, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 68.5, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2756278015230701219 @@ -6243,9 +6301,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6552677842084449146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 513.75, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 68.5, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4086053485889352588 @@ -6436,9 +6494,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6552677842084449146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 102.75, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 68.5, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7747941206271507375 @@ -6586,9 +6644,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6552677842084449146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 719.25, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 68.5, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &210884713592062119 @@ -6661,9 +6719,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6552677842084449146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 993.25, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 68.5, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1975886415892911861 @@ -6831,9 +6889,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6552677842084449146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 856.25, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 68.5, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2085836979284517684 @@ -7022,7 +7080,7 @@ RectTransform: m_Father: {fileID: 8995922341521496394} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.426, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -7191,9 +7249,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6552677842084449146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 650.75, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 68.5, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8157428590540182390 @@ -7301,9 +7359,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6552677842084449146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 445.25, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 68.5, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7304670376984328887 diff --git a/Assets/ResWork/Table/Export/Unit.json b/Assets/ResWork/Table/Export/Unit.json index 351da3c..8dc096b 100644 --- a/Assets/ResWork/Table/Export/Unit.json +++ b/Assets/ResWork/Table/Export/Unit.json @@ -1 +1 @@ -[{"n_UnitID":"1000","f_DefaultAttack":"100","f_DefaultHp":"500","f_AttackSpeed":"1.25","n_DefaultProjectileCount":"1","s_ProjectilePrefabs":"Projectile_Arrow","s_UnitPrefabPath":"DefaultUnit"}] \ No newline at end of file +[{"n_UnitID":"1000","f_DefaultAttack":"100","n_DefaultHp":"500","f_AttackSpeed":"1.25","n_DefaultProjectileCount":"1","s_ProjectilePrefabs":"Projectile_Arrow","s_UnitPrefabPath":"DefaultUnit"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/OneShotOneKill.xlsm b/Assets/ResWork/Table/OneShotOneKill.xlsm index 637f43c..e1cf629 100644 Binary files a/Assets/ResWork/Table/OneShotOneKill.xlsm and b/Assets/ResWork/Table/OneShotOneKill.xlsm differ diff --git a/Assets/SampleScene.unity b/Assets/SampleScene.unity index 877c27e..381f177 100644 --- a/Assets/SampleScene.unity +++ b/Assets/SampleScene.unity @@ -17457,6 +17457,22 @@ PrefabInstance: propertyPath: m_Name value: Play_Ingame objectReference: {fileID: 0} + - target: {fileID: 4111377606602774470, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4111377606602774470, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7296985114498065767, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7296985114498065767, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Script/InGame/IngameMgr.cs b/Assets/Script/InGame/IngameMgr.cs new file mode 100644 index 0000000..fa5d9e4 --- /dev/null +++ b/Assets/Script/InGame/IngameMgr.cs @@ -0,0 +1,65 @@ +using System.Collections; +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +public class IngameMgr : MonoBehaviour +{ + public TextMeshProUGUI[] texts_money; // 0 코인, 1 아이템, 2 웨이브 + public Text t_timer, t_hp, t_exp; + public Slider slider_wave, slider_exp; + + int m_Wave, m_HP, m_Coin, m_Item, m_Lv, m_Exp; + StageConfigTableData CurStageData; + + private void OnEnable() + { + CurStageData = table_stageconfig.Ins.Get_Data(10001); + var unitdata = table_unit.Ins.Get_Data(1000); + + m_HP = unitdata.n_DefaultHp; + m_Lv = m_Wave = 1; + m_Exp = m_Coin = m_Item = 0; + + Set_Texts(); + + StartCoroutine(Co_MakeMob()); + } + + void Set_Texts() + { + texts_money[0].text = m_Coin.ToString(); + texts_money[1].text = m_Item.ToString(); + texts_money[2].text = $"Wave {m_Wave}/{CurStageData.n_MaxWave}"; + slider_wave.value = ((m_Wave - 1) / (float)CurStageData.n_MaxWave); + + t_hp.text = m_HP.ToString(); + slider_exp.value = 0f; + } + + IEnumerator Co_MakeMob() + { + var wavedata = table_wavepattern.Ins.Get_Data(CurStageData.n_WavePatternGroupID, m_Wave); + if (wavedata == null) + { // 클리어 + yield break; + } + + // 일반 몬스터 생성 + int meleemobcount = 0, rangemobcount = 0; + var totalmobcount = wavedata.n_AppearMeleeMonster + wavedata.n_AppearRangeMonster; + for (int i = 0; i < totalmobcount; i++) + { + yield return new WaitForSeconds(wavedata.f_AppearDelay); + for (int j = 0; j < wavedata.n_OverlapUnitCount; j++) + { // 근거리 or 원거리 몹 생성 후 카운팅 + + } + } + + yield return new WaitForSeconds(wavedata.f_NextWaveDelay); + ++m_Wave; + Set_Texts(); + StartCoroutine(Co_MakeMob()); + } +} \ No newline at end of file diff --git a/Assets/Script/InGame/IngameMgr.cs.meta b/Assets/Script/InGame/IngameMgr.cs.meta new file mode 100644 index 0000000..61a5551 --- /dev/null +++ b/Assets/Script/InGame/IngameMgr.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 5d5c7d7015715f149a39eab8276626c3 \ No newline at end of file diff --git a/Assets/Script/Table/Tables/table_unit.cs b/Assets/Script/Table/Tables/table_unit.cs index 95765d1..90c4357 100644 --- a/Assets/Script/Table/Tables/table_unit.cs +++ b/Assets/Script/Table/Tables/table_unit.cs @@ -8,7 +8,7 @@ public class UnitTableData : TableDataBase ObscuredFloat _DefaultAttack; public float f_DefaultAttack { get { return _DefaultAttack; } set { _DefaultAttack = value; _DefaultAttack.RandomizeCryptoKey(); } } - ObscuredFloat _DefaultHp; public float f_DefaultHp { get { return _DefaultHp; } set { _DefaultHp = value; _DefaultHp.RandomizeCryptoKey(); } } + ObscuredInt _DefaultHp; public int n_DefaultHp { get { return _DefaultHp; } set { _DefaultHp = value; _DefaultHp.RandomizeCryptoKey(); } } ObscuredFloat _AttackSpeed; public float f_AttackSpeed { get { return _AttackSpeed; } set { _AttackSpeed = value; _AttackSpeed.RandomizeCryptoKey(); } } diff --git a/Assets/Script/Table/Tables/table_wavepattern.cs b/Assets/Script/Table/Tables/table_wavepattern.cs index 4a52873..3a170c1 100644 --- a/Assets/Script/Table/Tables/table_wavepattern.cs +++ b/Assets/Script/Table/Tables/table_wavepattern.cs @@ -32,5 +32,8 @@ public class table_wavepattern : table_base } public List Get_DataList() { return tableDatas; } - public WavePatternTableData Get_Data(int id) { return tableDatas.Find(f => f.n_PatternID == id); } + public WavePatternTableData Get_Data(int id, int wave) + { + return tableDatas.Find(f => f.n_PatternID == id && f.n_AppearWave == wave); + } } \ No newline at end of file diff --git a/Assets/Script/UGUI/Title/TitleLoadingUI.cs b/Assets/Script/UGUI/Title/TitleLoadingUI.cs index 5c33109..5e11423 100644 --- a/Assets/Script/UGUI/Title/TitleLoadingUI.cs +++ b/Assets/Script/UGUI/Title/TitleLoadingUI.cs @@ -55,7 +55,7 @@ public class TitleLoadingUI : MonoBehaviour { if (Proc_Value > slider_proc.value) { - slider_proc.value += Time.deltaTime * 0.75f; + slider_proc.value += Time.deltaTime * 1.75f; if (Proc_Value <= slider_proc.value) slider_proc.value = Proc_Value;