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

이것 저것 수정

This commit is contained in:
Ino 2025-07-23 15:26:02 +09:00
parent 4c637a0ba5
commit f230c541f2
9 changed files with 448 additions and 1229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/ResWork/Table/Export/Localization.json
View File

File diff suppressed because one or more lines are too long

BIN
Assets/ResWork/Table/butler.xlsm
View File

Binary file not shown.

78
Assets/ResWork/UIPrefabs/Collection/Equipment_Monster/CollectionEquipmentCard.prefab
View File

@ -281,7 +281,6 @@ RectTransform:
- {fileID: 7670993250085146987}
- {fileID: 2923538530552401233}
- {fileID: 8116232380095386588}
- {fileID: 3103851576076292379}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@ -303,6 +302,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
images:
- {fileID: 6301755371914612518}
- {fileID: 5047974329168649321}
texts:
- {fileID: 7992144186032099268}
- {fileID: 348960993680261740}
@ -310,7 +310,6 @@ MonoBehaviour:
- {fileID: 6602245033917613361}
slider_proc: {fileID: 1449530348186702030}
go_getreward: {fileID: 6069031652577001856}
go_selected: {fileID: 5109952517815358903}
--- !u!1 &4807964392580094178
GameObject:
m_ObjectHideFlags: 0
@ -535,81 +534,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &5109952517815358903
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3103851576076292379}
- component: {fileID: 6086892037436856795}
- component: {fileID: 6807062611053379901}
m_Layer: 5
m_Name: Selected
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3103851576076292379
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5109952517815358903}
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: 754867752535590494}
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 &6086892037436856795
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5109952517815358903}
m_CullTransparentMesh: 1
--- !u!114 &6807062611053379901
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5109952517815358903}
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: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 3b06875645f1f514391ec9f651113d0a, type: 3}
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!1 &5552512620973024506
GameObject:
m_ObjectHideFlags: 0

78
Assets/ResWork/UIPrefabs/Collection/Equipment_Monster/CollectionMonsterCard.prefab
View File

@ -282,7 +282,6 @@ RectTransform:
- {fileID: 2923538530552401233}
- {fileID: 8116232380095386588}
- {fileID: 1767226357509940386}
- {fileID: 3103851576076292379}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@ -304,6 +303,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
images:
- {fileID: 6301755371914612518}
- {fileID: 5047974329168649321}
texts:
- {fileID: 7992144186032099268}
- {fileID: 348960993680261740}
@ -311,7 +311,6 @@ MonoBehaviour:
- {fileID: 6602245033917613361}
slider_proc: {fileID: 1449530348186702030}
go_getreward: {fileID: 6069031652577001856}
go_selected: {fileID: 5109952517815358903}
--- !u!1 &4807964392580094178
GameObject:
m_ObjectHideFlags: 0
@ -536,81 +535,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &5109952517815358903
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3103851576076292379}
- component: {fileID: 6086892037436856795}
- component: {fileID: 6807062611053379901}
m_Layer: 5
m_Name: Selected
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3103851576076292379
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5109952517815358903}
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: 754867752535590494}
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 &6086892037436856795
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5109952517815358903}
m_CullTransparentMesh: 1
--- !u!114 &6807062611053379901
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5109952517815358903}
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: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 3b06875645f1f514391ec9f651113d0a, type: 3}
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!1 &5239245942721535251
GameObject:
m_ObjectHideFlags: 0

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

File diff suppressed because it is too large Load Diff

1
Assets/Script/Table/PC/table_classconfig.cs
View File

@ -197,6 +197,7 @@ public class ClassConfigTableData : TableDataBase
case eMainStatType.INT: return index == 0 ? UIAtlasMgr.Ins.Get_MainStatSprite(eStat.INT) : null;
case eMainStatType.INT_STR: return UIAtlasMgr.Ins.Get_MainStatSprite(index == 0 ? eStat.INT : eStat.STR);
case eMainStatType.INT_DEX: return UIAtlasMgr.Ins.Get_MainStatSprite(index == 0 ? eStat.INT : eStat.DEX);
case eMainStatType.LUCK: return index == 0 ? UIAtlasMgr.Ins.Get_MainStatSprite(eStat.LUK) : null;
}
return null;
}

6
Assets/Script/UI/Collection/Equipment_Monster/CollectionEMCardBase.cs
View File

@ -4,10 +4,10 @@ using UnityEngine.UI;
public class CollectionEMCardBase : CardBase
{
public Image[] images; // 0 아이콘
public Image[] images; // 0 아이콘, 1 bg
public TextMeshProUGUI[] texts; // 0 이름, 1 보유효과, 2 보유/필요. 3 보유효과 값
public Slider slider_proc;
public GameObject go_getreward, go_selected;
public GameObject go_getreward;
protected CollectionListTableData m_Data;
@ -24,7 +24,7 @@ public class CollectionEMCardBase : CardBase
}
public override TableDataBase Get_Data() { return m_Data; }
public override void Set_Selected(bool active) { go_selected.SetActive(active); }
public override void Set_Selected(bool active) { images[1].sprite = UIAtlasMgr.Ins.Get_Sprite(active ? "slot 2" : "slot 1"); }
public virtual void OnClick_Card() { }
public virtual void OnClick_GetReward() { }

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

@ -35,10 +35,10 @@ public class GachaRepeatReward : uScrollViewMgr
public void OnClick_Get()
{
//if (m_SelectID > 0)
if (m_SelectID > 0)
{
var sdata = ServerInfo.Ins.m_ServerData;
//if (sdata.Get_GachaPoint(m_Data.n_ID) >= m_Data.n_RepeatRewardPoint)
if (sdata.Get_GachaPoint(m_Data.n_ID) >= m_Data.n_RepeatRewardPoint)
{
ServerInfo.Ins.Save_GachaBonus(m_Data.n_ID, m_SelectID, () =>
{

8
Assets/Script/UI/Pet/PetUI_Right.cs
View File

@ -72,7 +72,13 @@ public class PetUI_Right : uScrollViewMgr
Set_UI();
}
bool CanEquip() { return ServerInfo.Ins.m_ServerData.Get_PetLv(Get_SelectPetData().n_PetID) > 0; }
bool CanEquip()
{
var sdata = ServerInfo.Ins.m_ServerData;
var petid = Get_SelectPetData().n_PetID;
var petlv = sdata.Get_PetLv(petid);
return petlv > 0 && !sdata.IsEquip(eItem.Pet, petid);
}
bool CanReinforce(bool showtoast)
{
var sdata = ServerInfo.Ins.m_ServerData;