fgb_ino
/
OneShotOneKill
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

스킬 및 서포터 작업 중... 2

This commit is contained in:
Ino 2026-01-16 10:25:32 +09:00
parent e5828f2d86
commit dca169122f
4 changed files with 202 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
Assets/ResWork/Prefab/Play_Ingame.prefab
View File

@ -3314,8 +3314,8 @@ RectTransform:
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: 0}
m_SizeDelta: {x: 82, y: 81}
m_AnchoredPosition: {x: 0, y: 1.0000001}
m_SizeDelta: {x: 57.3, y: 79.78}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4111377604966943459
CanvasRenderer:
@ -3345,7 +3345,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: bba354bf95bf64f168d348b80052dff7, type: 3}
m_Sprite: {fileID: 21300000, guid: 7a496f5f80b1c41d59f7bd0fc631cdb7, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -3441,6 +3441,7 @@ GameObject:
- component: {fileID: 4111377605057742992}
- component: {fileID: 4111377605057742994}
- component: {fileID: 4111377605057742993}
- component: {fileID: 4205627448223400625}
m_Layer: 5
m_Name: Button_Skill_Slot2
m_TagString: Untagged
@ -3507,6 +3508,62 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &4205627448223400625
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4111377605057742999}
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: 4111377605057742993}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 6233565954278996248}
m_TargetAssemblyTypeName: IngameMgr, Assembly-CSharp
m_MethodName: OnClick_SkillButton
m_Mode: 3
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 1
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &4111377605120860862
GameObject:
m_ObjectHideFlags: 0
@ -3669,6 +3726,7 @@ GameObject:
- component: {fileID: 4111377605223402641}
- component: {fileID: 4111377605223402643}
- component: {fileID: 4111377605223402642}
- component: {fileID: 7286381742500867721}
m_Layer: 5
m_Name: Button_Skill_Slot1
m_TagString: Untagged
@ -3735,6 +3793,62 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &7286381742500867721
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4111377605223402640}
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: 4111377605223402642}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 6233565954278996248}
m_TargetAssemblyTypeName: IngameMgr, Assembly-CSharp
m_MethodName: OnClick_SkillButton
m_Mode: 3
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!1 &4111377605235060810
GameObject:
m_ObjectHideFlags: 0
@ -5033,7 +5147,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: feff385501ef94fb09731630b5606c35, type: 3}
m_Sprite: {fileID: 21300000, guid: 823f6834948ee43938566a8aeae598e1, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -5196,7 +5310,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &4111377606575878288
RectTransform:
m_ObjectHideFlags: 0
@ -5347,6 +5461,13 @@ MonoBehaviour:
- {fileID: 5678767516249178587}
tf_hudparent: {fileID: 6585150402215888903}
tf_fence: {fileID: 5691718172133534467}
go_Supporter: {fileID: 83308978841818612}
images_skillcool:
- {fileID: 4111377605378486165}
- {fileID: 4111377606575878289}
texts_skillcool:
- {fileID: 4111377606358040846}
- {fileID: 4111377606590957783}
--- !u!1 &4111377606590957781
GameObject:
m_ObjectHideFlags: 0
@ -5662,7 +5783,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 4335ec254d794483ba6e7ecaa9fe094f, type: 3}
m_Sprite: {fileID: 21300000, guid: 9316653827d554a708a2aaa3dc5fb397, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@ -5918,7 +6039,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 89, y: 80}
m_SizeDelta: {x: 91, y: 83}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4111377606704471110
CanvasRenderer:
@ -5948,7 +6069,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 7a3327860e5b74536a19c15415d850dd, type: 3}
m_Sprite: {fileID: 21300000, guid: a033cea4a39ce430ea12f95b9b9edb9e, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -8345,6 +8466,11 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c968a59c90ade6d4bbd85782c0ce38b9, type: 3}
--- !u!1 &83308978841818612 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 497443208249652342, guid: c968a59c90ade6d4bbd85782c0ce38b9, type: 3}
m_PrefabInstance: {fileID: 558654047437005186}
m_PrefabAsset: {fileID: 0}
--- !u!4 &7208776526740242564 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7190565166110990598, guid: c968a59c90ade6d4bbd85782c0ce38b9, type: 3}

7
Assets/Resources/Projectile/FX_Cartoon Thunder.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 108d1b5c745f7cf43abd1e794ca9f599
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

15
Assets/Resources/Projectile/P_electric.prefab
View File

@ -9,6 +9,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 871324411638548332}
- component: {fileID: 2542221352418147852}
m_Layer: 0
m_Name: P_electric
m_TagString: Untagged
@ -32,6 +33,20 @@ Transform:
- {fileID: 8730935763616485830}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2542221352418147852
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 871324411638548333}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ccfe1723f3c6dc74787642c082b79437, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Speed: 12
radius: 0.1
--- !u!1 &3236510714245265456
GameObject:
m_ObjectHideFlags: 0

46
Assets/Script/InGame/IngameMgr.cs
View File

@ -21,6 +21,12 @@ public class IngameMgr : MonoBehaviourSingletonTemplate<IngameMgr>
[Header("Fence")]
public Transform tf_fence;
[Header("서포터")]
public GameObject go_Supporter;
public Image[] images_skillcool;
public TextMeshProUGUI[] texts_skillcool;
float f_SupporterCoolTime = 0f, f_SkillCoolTime = 0f;
int m_Wave, m_HP, m_Coin, m_Item, m_Exp;
StageConfigTableData CurStageData;
UnitTableData CurUnitData;
@ -52,6 +58,9 @@ public class IngameMgr : MonoBehaviourSingletonTemplate<IngameMgr>
m_MobMakeCount += CurStageData.dic_boss.Count;
m_MobMakeCount.RandomizeCryptoKey();
go_Supporter.SetActive(false);
f_SupporterCoolTime = f_SkillCoolTime = 0f;
Set_SkillUI();
Set_Texts();
Set_Exp(0);
@ -61,6 +70,7 @@ public class IngameMgr : MonoBehaviourSingletonTemplate<IngameMgr>
private void Update()
{
Set_Timer();
Set_SkillUI();
}
public void ReturnMob(MobActor mob)
@ -68,6 +78,28 @@ public class IngameMgr : MonoBehaviourSingletonTemplate<IngameMgr>
mob.gameObject.SetActive(false);
}
void Set_SkillUI()
{
texts_skillcool[0].text = DSUtil.Get_TimeText_MS(f_SkillCoolTime);
texts_skillcool[1].text = DSUtil.Get_TimeText_MS(f_SupporterCoolTime);
images_skillcool[0].enabled = f_SkillCoolTime > 0;
images_skillcool[1].enabled = f_SupporterCoolTime > 0;
if (images_skillcool[0].enabled)
{
f_SkillCoolTime -= Time.deltaTime;
images_skillcool[0].fillAmount = f_SkillCoolTime / 10f;
}
else texts_skillcool[0].text = "";
if (images_skillcool[1].enabled)
{
f_SupporterCoolTime -= Time.deltaTime;
images_skillcool[1].fillAmount = f_SupporterCoolTime / 600f;
}
else texts_skillcool[1].text = "";
}
void Set_Texts()
{
texts_money[0].text = m_Coin.ToString();
@ -279,4 +311,18 @@ public class IngameMgr : MonoBehaviourSingletonTemplate<IngameMgr>
return 0;
}
#endregion
public void OnClick_SkillButton(int index)
{
if (index == 0)
{
if (f_SkillCoolTime > 0f) return;
f_SkillCoolTime = 10f;
}
else
{
if (f_SupporterCoolTime > 0f) return;
f_SupporterCoolTime = 600f;
}
}
}