NerdNavis_AiDev
/
Project_WL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

뽑기 완료

This commit is contained in:
Ino 2025-04-19 07:47:44 +09:00
parent 43b8d4c549
commit d971152d38
5 changed files with 290 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Ino_nerdnavis.txt
View File

@ -88,11 +88,5 @@ messageinfo 엄청 느린 버그
상점
장비 착용 에러 수정하자
뽑기 후 뽑기권 없다는 거 수정하자
뽑기
// - 무기, 방어구, 장신구, 스킬
// - 10회, 50회마다 혜택 적용
// - 100회마다 한정 상자 뽑기 가능
- 한정 상자 획득 가능 시 알림
// - 스킬 데이터에 스킬 갯수 추가
// - 스킬 각성 시 각성 재료가 아닌 같은 스킬 사용

269
Assets/Res_Addr/MainUI/NewGameUI.prefab
View File

@ -18812,7 +18812,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &7202680468911644025
RectTransform:
m_ObjectHideFlags: 0
@ -27815,6 +27815,8 @@ MonoBehaviour:
gacha_btns:
- {fileID: 6559969037301942703}
- {fileID: 6398787019567080357}
gos:
- {fileID: 8820785270559013803}
m_slider: {fileID: 2497281915973896408}
m_GachaRepeatReward: {fileID: 4971820594429145345}
--- !u!222 &1084326001364914347
@ -52335,6 +52337,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 5070997152126263843}
- {fileID: 8765261026461468677}
m_Father: {fileID: 795777954291663711}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@ -100643,7 +100646,8 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Children:
- {fileID: 1560153692238851678}
m_Father: {fileID: 3677292556851141723}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@ -119145,6 +119149,7 @@ MonoBehaviour:
m_BuffADUI: {fileID: 7927918590583056939}
gos_noti:
- {fileID: 3786295824972111576}
- {fileID: 1615394283807579632}
--- !u!223 &7830712477181563274
Canvas:
m_ObjectHideFlags: 0
@ -141131,6 +141136,136 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 4255785881878661189}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4257963774550890017
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 4573262047446181533}
m_Modifications:
- target: {fileID: 3277595734800223185, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_Name
value: Noti_gacha
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_AnchorMin.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_SizeDelta.x
value: 21
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_SizeDelta.y
value: 20
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -10.5
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -10
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a00dadd9f440a9140a4635e892b7d8c3, type: 3}
--- !u!1 &1615394283807579632 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3277595734800223185, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
m_PrefabInstance: {fileID: 4257963774550890017}
m_PrefabAsset: {fileID: 0}
--- !u!224 &8765261026461468677 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
m_PrefabInstance: {fileID: 4257963774550890017}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4368840634316433114
PrefabInstance:
m_ObjectHideFlags: 0
@ -146660,6 +146795,136 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b055af6abeefd104995ea4fdfcd9b939, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &6275170748909793402
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 3541516299667140600}
m_Modifications:
- target: {fileID: 3277595734800223185, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_Name
value: Noti_box
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_AnchorMin.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_SizeDelta.x
value: 21
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_SizeDelta.y
value: 20
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -10.5
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -10
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a00dadd9f440a9140a4635e892b7d8c3, type: 3}
--- !u!224 &1560153692238851678 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
m_PrefabInstance: {fileID: 6275170748909793402}
m_PrefabAsset: {fileID: 0}
--- !u!1 &8820785270559013803 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3277595734800223185, guid: a00dadd9f440a9140a4635e892b7d8c3,
type: 3}
m_PrefabInstance: {fileID: 6275170748909793402}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6366420720556538463
PrefabInstance:
m_ObjectHideFlags: 0

10
Assets/Script/Server/ServerClass.cs
View File

@ -1234,6 +1234,16 @@ public partial class ServerData
Gacha[key][0].RandomizeCryptoKey();
}
}
public bool Noti_Gacha()
{
var lst = table_gachaconfig.Ins.Get_DataList();
for (int i = 0; i < lst.Count; i++)
{
if (Get_GachaPoint(lst[i].n_ID) >= lst[i].n_RepeatRewardPoint)
return true;
}
return false;
}
#endregion
#region Common

4
Assets/Script/UI/Gacha/GachaBase.cs
View File

@ -6,6 +6,7 @@ public class GachaBase : MonoBehaviour
{
public TextMeshProUGUI[] texts; // 0 진행율, 1 혜택1, 2 혜택2, 3 반복뽑기 횟수
public btn_gacha[] gacha_btns; // 0 10회, 1 1회
public GameObject[] gos; // 0 한정상자 노티
public Slider m_slider;
public GachaRepeatReward m_GachaRepeatReward;
@ -35,6 +36,9 @@ public class GachaBase : MonoBehaviour
texts[2].text = DSUtil.Format(380, benefit2Count - sdata.Get_GachaCount(m_Data.n_ID) % benefit2Count,
MyText.Get_GradeName(benefit2Grade));
texts[3].text = DSUtil.Format(379, m_Data.n_RepeatRewardPoint);
gos[0].SetActive(m_slider.value >= 1f);
NewGameUI.Ins.Set_Noti();
}
public void OnClick_RepeatReward()

9
Assets/Script/UI/NewGameUI.cs
View File

@ -23,7 +23,7 @@ public class NewGameUI : MonoBehaviourSingletonTemplate<NewGameUI>
public BotMenuBase[] FarmMenu;
public MissionUI m_MissionUI;
public BuffADUI m_BuffADUI;
public GameObject[] gos_noti; // 0 우편
public GameObject[] gos_noti; // 0 우편, 1 뽑기
bool ShowQuick = true;
@ -36,6 +36,7 @@ public class NewGameUI : MonoBehaviourSingletonTemplate<NewGameUI>
cameraData.cameraStack.Add(UICamera);
MailUI.Ins.Set(true);
Set_Noti();
}
#if UNITY_EDITOR
@ -46,6 +47,12 @@ public class NewGameUI : MonoBehaviourSingletonTemplate<NewGameUI>
}
#endif
public void Set_Noti()
{
var sdata = ServerInfo.Ins.m_ServerData;
gos_noti[1].SetActive(sdata.Noti_Gacha());
}
public void SetUI_byGameMode(eGameMode gameMode, bool farm = false)
{
if (farm) gameMode = eGameMode.Stage;