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-14 11:10:38 +09:00
parent 4118ffb76a
commit 353395bdb1
13 changed files with 11 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Assets/Script/Table/table_shop.cs
View File

@ -13,7 +13,6 @@ public enum ePriceType { Cash, AD, Gem = eItem.Gem, Review }
public class ShopTableData : TableDataBase
{
public string InappID, Desc, IconSub, BuyCondition;
string Icon, Name;
public eShopTab Tab;
public eItem Item, ObtainCheckItem;
public ePriceType PriceType;
@ -21,10 +20,6 @@ public class ShopTableData : TableDataBase
public ObscuredInt BuyLimit, BuyLimit_Day, BuyLimit_Week, BuyLimit_Month;
public ObscuredDouble Amount;
public bool IsBest, IsRocket;
public void Set_Icon(string icon) { Icon = icon; }
public string Get_Icon() { return Tab == eShopTab.Package || !string.IsNullOrEmpty(Icon) ? Icon : DSUtil.Get_ItemSpriteInfo(Item, ItemID).Icon; }
public void Set_Name(string _name) { Name = _name; }
}
public class table_shop : MonoBehaviour
@ -54,9 +49,7 @@ public class table_shop : MonoBehaviour
temp.ID = int.Parse(json["ID"].ToString());
temp.Tab = DSUtil.StringToEnum<eShopTab>(json["Tab"].ToString());
temp.InappID = json["InappID"].ToString();
temp.Set_Icon(json["Icon"].ToString());
temp.IconSub = json["IconSub"].ToString();
temp.Set_Name(json["Name"].ToString());
temp.Desc = json["Desc"].ToString();
temp.BuyCondition = json["BuyCondition"].ToString();
temp.NumUI = int.Parse(json["NumUI"].ToString());

21
Assets/Script/UI/Center/Mail/MailCard.cs
View File

@ -1,11 +1,10 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using TMPro;
using UnityEngine.UI;
public class MailCard : CardBase
{
public UISprite[] sprites; // 0 아이콘
public UILabel[] labels; // 0 메시지, 1 남은 시간
public Image[] images; // 0 보상 아이콘
public TextMeshProUGUI[] texts; // 0 보상, 1 메시지, 2 남은 시간
ServerMailData m_ServerMailData;
@ -14,15 +13,11 @@ public class MailCard : CardBase
base.Set(_base);
m_ServerMailData = _base as ServerMailData;
sprites[0].spriteName = DSUtil.Get_ItemSpriteInfo(m_ServerMailData.Item, m_ServerMailData.ID).Icon;
sprites[0].MakePixelPerfect();
if (sprites[0].width > 55 || sprites[0].height > 55)
sprites[0].SetDimensions(55, 55);
labels[0].text = m_ServerMailData.Msg;
images[0].sprite = UIAtlasMgr.Ins.Get_Sprite(m_ServerMailData.ID);
var ts = m_ServerMailData.RemnantTime - ServerInfo.ServerTime;
if (ts.TotalDays < 1) labels[1].text = DSUtil.Format(145, ts.Hours, ts.Minutes);
else labels[1].text = DSUtil.Format(146, (int)ts.TotalDays);
if (ts.TotalDays < 1) texts[0].text = DSUtil.Format(145, ts.Hours, ts.Minutes);
else texts[0].text = DSUtil.Format(146, (int)ts.TotalDays);
texts[1].text = m_ServerMailData.Msg;
}
public void OnClick_GetReward()

4
Assets/Script/UI/Center/Pass/PassCard.cs
View File

@ -1,4 +1,3 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@ -15,9 +14,6 @@ public class PassCard : CardBase
base.Set(_base);
m_PassTableData = _base as PassTableData;
sprites[0].spriteName = DSUtil.Get_ItemSpriteInfo(m_PassTableData.FreeReward).Icon;
sprites[1].spriteName = DSUtil.Get_ItemSpriteInfo(m_PassTableData.PassReward).Icon;
labels[0].text = Get_Condition();
labels[1].text = DSUtil.GetThousandCommaText(m_PassTableData.FreeRewardAmount);
labels[2].text = DSUtil.GetThousandCommaText(m_PassTableData.PassRewardAmount);

1
Assets/Script/UI/Center/Pass/PassContent.cs
View File

@ -58,7 +58,6 @@ public class PassContent : ScrollViewMgr
else
labels[1].text = price;
labels[2].text = str_desc[passtype];
sprites[0].spriteName = sprites[1].spriteName = DSUtil.Get_ItemSpriteInfo(eItem.Pass, passtype).Icon;
switch (passtype)
{
case 0:

3
Assets/Script/UI/Common/IngameGetItemCard.cs
View File

@ -14,9 +14,6 @@ public class IngameGetItemCard : CardBase
base.Set(_base);
var _id = _base as ObtainItemData;
m_ItemData = new ItemData(_id.m_Item, _id.m_ID, _id.m_Amount, "", eUICardType.GetItem);
var IconInfo = DSUtil.Get_ItemSpriteInfo(_id.m_Item, _id.m_ID);
sprites[0].spriteName = IconInfo.Icon;
sprites[1].spriteName = IconInfo.SubIcon;
label_amount.text = _id.m_Amount.ToString();
}

4
Assets/Script/UI/Common/UIItemCard.cs
View File

@ -15,7 +15,6 @@ public class ItemData
public ObscuredInt Lv, TLv, Stone;
public ObscuredDouble Amount;
public string Name, Desc, Cause, AttackTypeIcon, Deck;
public ItemIconInfo IconInfo;
public eUICardType UICardType;
ObscuredInt ID;
@ -36,7 +35,6 @@ public class ItemData
Grade = eItemGrade.Common;
//Name = MyText.Get_ItemName(ID);
Desc = MyText.Get_ItemDesc(ItemType, ID);
IconInfo = DSUtil.Get_ItemSpriteInfo(ItemType, ID);
var sdata = ServerInfo.Ins.m_ServerData;
if (sdata == null) return;
if (id > 0)
@ -172,10 +170,8 @@ public class UIItemCard : CardCoolTimeBase
sprites[(int)eUICardSprite.Grade].sprite = UIAtlasMgr.Ins.Get_Sprite("getitembg");
break;
}
sprites[(int)eUICardSprite.Icon].sprite = UIAtlasMgr.Ins.Get_Sprite(m_ItemData.IconInfo.Icon);
sprites[(int)eUICardSprite.Icon].enabled = true;
sprites[(int)eUICardSprite.Icon].SetNativeSize();
sprites[(int)eUICardSprite.SubIcon].sprite = UIAtlasMgr.Ins.Get_Sprite(m_ItemData.IconInfo.SubIcon);
sprites[(int)eUICardSprite.SubIcon].enabled = !DSUtil.CheckNull(sprites[(int)eUICardSprite.SubIcon].sprite);
labels[(int)eUICardLabel.Amount].text = DSUtil.GetThousandCommaText(m_ItemData.Amount);

18
Assets/Script/UI/Shop/EventRewardCard.cs
View File

@ -1,18 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class EventRewardCard : CardBase
{
public UISprite[] sprites; // 0 아이콘
public UILabel[] labels; // 0 개수
public override void Set<T>(T _base)
{
base.Set(_base);
var _id = _base as ObtainItemData;
sprites[0].spriteName = DSUtil.Get_ItemSpriteInfo(_id.m_Item, _id.m_ID).Icon;
labels[0].text = DSUtil.GetThousandCommaText(_id.m_Amount);
}
}

11
Assets/Script/UI/Shop/EventRewardCard.cs.meta
View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: cd766ee478c37e84d932506df22fbce3
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

3
Assets/Script/UI/Shop/ShopCardBase.cs
View File

@ -65,7 +65,6 @@ public class ShopCardBase : CardBase
else
labels[4].transform.parent.gameObject.SetActive(false);
sprites[0].spriteName = m_ShopTableData.Get_Icon();
sprites[1].spriteName = Get_MoneyIcon();
gos[0].SetActive(sdata.CanShow_ShopAD(m_ShopTableData.ID));
@ -161,7 +160,7 @@ public class ShopCardBase : CardBase
labels[2].transform.localPosition = Vector3.zero;
return "empty";
default:
return DSUtil.Get_ItemSpriteInfo((eItem)m_ShopTableData.PriceType).Icon;
return "";
}
}

4
Assets/Script/UI/Shop/ShopCountPopup.cs
View File

@ -1,7 +1,4 @@
using CodeStage.AntiCheat.ObscuredTypes;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class ShopCountPopup : BackKeyAdd
{
@ -23,7 +20,6 @@ public class ShopCountPopup : BackKeyAdd
m_BuyItemPerAmount = peramount; m_BuyItemPerAmount.RandomizeCryptoKey();
sprites[0].spriteName = icon;
sprites[2].spriteName = DSUtil.Get_ItemSpriteInfo(useitem).Icon;
m_ArrowUI.Set(totalamount =>
{

6
Assets/Script/UI/Stage/SmallItemGetCard.cs
View File

@ -1,5 +1,3 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class SmallItemGetCard : MyCoroutine
@ -17,8 +15,8 @@ public class SmallItemGetCard : MyCoroutine
Set_RunUpdate();
sprites[0].spriteName = DSUtil.Get_GradeSpriteName(_id.Grade);
sprites[1].spriteName = _id.IconInfo.Icon;
sprites[2].spriteName = _id.IconInfo.SubIcon;
//sprites[1].spriteName = _id.IconInfo.Icon;
//sprites[2].spriteName = _id.IconInfo.SubIcon;
label_amount.text = NumberFormatter.FormatNumber(_id.Amount);
}

78
Assets/Script/Util/DSUtil.cs
View File

@ -892,84 +892,6 @@ public static partial class DSUtil
{
return Format("grade{0}", (int)_Grade);
}
public static ItemIconInfo Get_ItemSpriteInfo(eItem item, int id = 0)
{
var rtn = new ItemIconInfo { Icon = "empty", SubIcon = "empty" };
switch (item)
{
default: rtn.Icon = Format("icon_{0}", item.ToString().ToLower()); break;
case eItem.WeaponStone: rtn.Icon = "stone_weapon"; break;
case eItem.RingStone: rtn.Icon = "stone_ring"; break;
case eItem.NeckStone: rtn.Icon = "stone_neck"; break;
case eItem.BootsStone: rtn.Icon = "stone_boots"; break;
case eItem.FairyStone: rtn.Icon = "stone_fairy"; break;
case eItem.SelectSkillShuffle: rtn.Icon = "selectskilldice"; break;
case eItem.ChapterQuestShuffle: rtn.Icon = "chapterquestdice"; break;
case eItem.mClover: rtn.Icon = "m_clover"; break;
case eItem.MemoryField: rtn.Icon = "fragments_memoryfield"; break;
case eItem.MemoryForest: rtn.Icon = "Fragments_MemoryForest"; break;
case eItem.MemoryDungeon: rtn.Icon = "Fragments_MemoryDungeon"; break;
case eItem.MemoryWitchGrade: rtn.Icon = "Fragments_MemoryWithchGrade"; break;
case eItem.MemoryPetBattle: rtn.Icon = "Fragments_MemoryPetBattle"; break;
case eItem.AllGambleTicket: rtn.Icon = "gambleticket_all"; break;
case eItem.WeaponTicket: rtn.Icon = "gambleticket_weapon"; break;
case eItem.RingTicket: rtn.Icon = "gambleticket_ring"; break;
case eItem.NeckTicket: rtn.Icon = "gambleticket_neck"; break;
case eItem.BootsTicket: rtn.Icon = "gambleticket_boots"; break;
case eItem.FairyTicket: rtn.Icon = "gambleticket_fairy"; break;
case eItem.MagicTicket: rtn.Icon = "gambleticket_magic"; break;
case eItem.PetTicket: rtn.Icon = "gambleticket_pet"; break;
case eItem.PC:
var pcdata = table_itemlist.Ins.Get_Data(id);
rtn.Icon = pcdata.s_ItemIcon;
rtn.SubIcon = pcdata.s_ItemIcon;
break;
case eItem.WeaponCostume:
case eItem.Weapon:
case eItem.Armor:
case eItem.Helmet:
case eItem.Extra:
case eItem.Necklace:
case eItem.Ring:
rtn.Icon = table_itemlist.Ins.Get_Data(id).s_ItemIcon; break;
case eItem.Fairy: rtn.Icon = table_fairy.Ins.Get_Icon(id); break;
case eItem.Skill: rtn.Icon = table_skilllist.Ins.Get_SkillIcon(id); break;
case eItem.Pet: rtn.Icon = table_petlist.Ins.Get_Data_orNull(id).Get_Icon(); break;
case eItem.Farmer:
break;
case eItem.Book: rtn.Icon = Format("book{0}", id); break;
case eItem.Page: rtn.Icon = "bookpage"; break;
case eItem.Food:
break;
case eItem.Seed:
break;
case eItem.Pass: rtn.Icon = Format("pass{0}", id); break;
case eItem.ADRemove: rtn.Icon = "icon_ad"; break;
case eItem.ShopPackage: rtn.Icon = table_shop.Ins.Get_Data(id).Get_Icon(); break;
case eItem.DailyInit: case eItem.IdontKnow: rtn.Icon = "randomitem"; break;
case eItem.Relic:
case eItem.Potion: rtn.Icon = table_kettle.Ins.Get_Data(id).Icon; break;
case eItem.RoulletteTicket: rtn.Icon = "roulletteticket"; break;
}
return rtn;
}
public static eItem Get_StoneType(eItem _item)
{
switch (_item)
{
case eItem.Weapon: return eItem.WeaponStone;
case eItem.Ring: return eItem.RingStone;
case eItem.Necklace: return eItem.NeckStone;
case eItem.Extra: return eItem.BootsStone;
case eItem.Fairy: return eItem.FairyStone;
}
return eItem.None;
}
public static int Get_RandomIndex(List<float> probs)
{

1
Assets/Script/Util/MyClass.cs
View File

@ -252,7 +252,6 @@ public class CountLevelData
}
public class MobDropItems { public ObscuredDouble Gold, Exp, Stone, Potion, PartyStone, AvatarStone, Gem, DropEvent; }
public class ItemIconInfo { public string Icon, SubIcon; }
public class ShieldInfo { public GameObject go; public double rate; }
public class UseMagicInfo { public SkillListTableData m_SkillTableData; public int m_uiIndex; }
public class ItemSimpleData