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

앨범, 가챠 스킵 등

This commit is contained in:
Ino 2025-12-16 12:03:15 +09:00
parent cb8a5098c5
commit f4eee44563
4 changed files with 139 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
Assets/Scenes/SampleScene.unity
View File

@ -3350,7 +3350,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &85747004
RectTransform:
m_ObjectHideFlags: 0
@ -5473,7 +5473,7 @@ GameObject:
m_Component:
- component: {fileID: 154305215}
m_Layer: 5
m_Name: OpenUI
m_Name: SpecialAlbumOpen
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -6258,7 +6258,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &168358558
RectTransform:
m_ObjectHideFlags: 0
@ -13708,7 +13708,7 @@ GameObject:
m_Component:
- component: {fileID: 340825016}
m_Layer: 5
m_Name: minigame
m_Name: MiniGameAlbumSelect
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -20000,6 +20000,11 @@ MonoBehaviour:
gos_onoff:
- {fileID: 85747003}
- {fileID: 1524862914}
specialCards:
- {fileID: 1578041157}
- {fileID: 1418805522}
- {fileID: 1941806848}
- {fileID: 870291109}
--- !u!1 &479457677
GameObject:
m_ObjectHideFlags: 0
@ -23065,7 +23070,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 87.972, y: 6.639998}
m_AnchoredPosition: {x: 87.972, y: 6.6399994}
m_SizeDelta: {x: -175.94, y: -13.28}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &533070488
@ -37300,6 +37305,17 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 1784483653465108159, guid: 57bef01642d6bcb499dd08ed65819030, type: 3}
m_PrefabInstance: {fileID: 870291107}
m_PrefabAsset: {fileID: 0}
--- !u!114 &870291109 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3717553095776443215, guid: 57bef01642d6bcb499dd08ed65819030, type: 3}
m_PrefabInstance: {fileID: 870291107}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a32fb464b45d18b459843b80928e0435, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &871273874
GameObject:
m_ObjectHideFlags: 0
@ -49831,7 +49847,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -135.8, y: 5.6}
m_AnchoredPosition: {x: -135.79999, y: 5.6}
m_SizeDelta: {x: 182.37, y: 61}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1128410101
@ -51262,6 +51278,63 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1173253487}
m_CullTransparentMesh: 1
--- !u!1001 &1176248177
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2923904872549073819, guid: b92c7bec9741ee44b897051958ae6f1b, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2923904872549073819, guid: b92c7bec9741ee44b897051958ae6f1b, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2923904872549073819, guid: b92c7bec9741ee44b897051958ae6f1b, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2923904872549073819, guid: b92c7bec9741ee44b897051958ae6f1b, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2923904872549073819, guid: b92c7bec9741ee44b897051958ae6f1b, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2923904872549073819, guid: b92c7bec9741ee44b897051958ae6f1b, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2923904872549073819, guid: b92c7bec9741ee44b897051958ae6f1b, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2923904872549073819, guid: b92c7bec9741ee44b897051958ae6f1b, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2923904872549073819, guid: b92c7bec9741ee44b897051958ae6f1b, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2923904872549073819, guid: b92c7bec9741ee44b897051958ae6f1b, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5075662245161426955, guid: b92c7bec9741ee44b897051958ae6f1b, type: 3}
propertyPath: m_Name
value: GameBG_Girls
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b92c7bec9741ee44b897051958ae6f1b, type: 3}
--- !u!1 &1176259464
GameObject:
m_ObjectHideFlags: 0
@ -53276,7 +53349,7 @@ MonoBehaviour:
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_PressedColor: {r: 1, g: 1, b: 1, 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
@ -62145,6 +62218,17 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 1784483653465108159, guid: 57bef01642d6bcb499dd08ed65819030, type: 3}
m_PrefabInstance: {fileID: 1418805520}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1418805522 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3717553095776443215, guid: 57bef01642d6bcb499dd08ed65819030, type: 3}
m_PrefabInstance: {fileID: 1418805520}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a32fb464b45d18b459843b80928e0435, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1424303819
GameObject:
m_ObjectHideFlags: 0
@ -68030,6 +68114,17 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 1784483653465108159, guid: 57bef01642d6bcb499dd08ed65819030, type: 3}
m_PrefabInstance: {fileID: 1578041155}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1578041157 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3717553095776443215, guid: 57bef01642d6bcb499dd08ed65819030, type: 3}
m_PrefabInstance: {fileID: 1578041155}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a32fb464b45d18b459843b80928e0435, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1578842893
GameObject:
m_ObjectHideFlags: 0
@ -72276,7 +72371,7 @@ RectTransform:
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: 13.900024}
m_AnchoredPosition: {x: 0, y: 13.899902}
m_SizeDelta: {x: 0, y: -302.11}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1661949821
@ -83824,7 +83919,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1918801481
RectTransform:
m_ObjectHideFlags: 0
@ -85291,6 +85386,17 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 1784483653465108159, guid: 57bef01642d6bcb499dd08ed65819030, type: 3}
m_PrefabInstance: {fileID: 1941806846}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1941806848 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3717553095776443215, guid: 57bef01642d6bcb499dd08ed65819030, type: 3}
m_PrefabInstance: {fileID: 1941806846}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a32fb464b45d18b459843b80928e0435, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1941958623
GameObject:
m_ObjectHideFlags: 0
@ -96923,3 +97029,4 @@ SceneRoots:
- {fileID: 201009777}
- {fileID: 9115509774314965572}
- {fileID: 1568245901}
- {fileID: 1176248177}

7
Assets/Scripts/UI/AlbumCard.cs
View File

@ -19,10 +19,17 @@ public class AlbumCard : CardBase
}
public override void Set_UI()
{
if (m_Data.e_CollectionMethod == eCollectionMethod.Normal)
{
var preData = table_album.Ins.Get_PreData_orNull(m_Data);
gos[0].SetActive(SaveMgr.Ins.IsObtainGirl(m_Data.n_GirlID) && !SaveMgr.Ins.IsOpenAlbum(m_Data) &&
(preData == null || SaveMgr.Ins.IsOpenAlbum(preData)));
}
else
{
gos[0].SetActive(SaveMgr.Ins.IsObtainGirl(m_Data.n_GirlID) && !SaveMgr.Ins.IsOpenAlbum(m_Data));
}
t_price.text = m_Data.n_Price.ToString();
gos[1].SetActive(!IsObtain());
}

6
Assets/Scripts/UI/AlbumUI.cs
View File

@ -5,6 +5,7 @@ public class AlbumUI : uScrollViewMgr
{
public TextMeshProUGUI[] texts; // 0 이름, 1 카운팅, 2 보유 하트
public GameObject[] gos_onoff;
public AlbumCard[] specialCards;
int curGirl = 1;
@ -43,6 +44,11 @@ public class AlbumUI : uScrollViewMgr
texts[2].text = SaveMgr.Ins.Get_Money(eMoney.AlbumOpen).ToString();
list_CardBase.ForEach(f => f.Set_UI());
specialCards[0].Set(table_album.Ins.Get_SpecialAlbum(curGirl, eCollectionMethod.Default));
specialCards[1].Set(table_album.Ins.Get_SpecialAlbum(curGirl, eCollectionMethod.Gacha));
specialCards[2].Set(table_album.Ins.Get_SpecialAlbum(curGirl, eCollectionMethod.FullCollection));
specialCards[3].Set(table_album.Ins.Get_SpecialAlbum(curGirl, eCollectionMethod.Mission));
}
public void OnClick_Arrow(int add)

9
Assets/Scripts/UI/GachaUI.cs
View File

@ -239,7 +239,10 @@ public class GachaUI : uScrollViewMgr
IEnumerator GachaReward()
{
yield return new WaitForSeconds(4f);
yield return GachaReward2();
}
IEnumerator GachaReward2()
{
SaveMgr.Ins.Add_Money(eMoney.Gacha, -table_GlobalValue.Ins.Get_Int("GachaAmount"));
var gradedata = table_gacharateconfig.Ins.Get_RadomData();
var reward = table_gachareward.Ins.Get_Reward(gradedata.n_GachaGrade);
@ -313,7 +316,9 @@ public class GachaUI : uScrollViewMgr
//m_GachaAnim.Sample(); // 즉시 반영
Init_GachaAnim();
StartCoroutine(GachaReward());
StartCoroutine(GachaReward2());
ulong lastFrame = videoPlayer.frameCount - 1;
videoPlayer.frame = (long)lastFrame;
}
public void OnClick_GachaRate()