diff --git a/Assets/Resources/Fgui/Common/Common_atlas0.png b/Assets/Resources/Fgui/Common/Common_atlas0.png index e855ea9b8..05c98efc3 100644 Binary files a/Assets/Resources/Fgui/Common/Common_atlas0.png and b/Assets/Resources/Fgui/Common/Common_atlas0.png differ diff --git a/Assets/Resources/Fgui/Common/Common_fui.bytes b/Assets/Resources/Fgui/Common/Common_fui.bytes index a533a7638..016263ebb 100644 Binary files a/Assets/Resources/Fgui/Common/Common_fui.bytes and b/Assets/Resources/Fgui/Common/Common_fui.bytes differ diff --git a/Assets/Resources/Fgui/Main/Main_fui.bytes b/Assets/Resources/Fgui/Main/Main_fui.bytes index f700e8b65..de221569a 100644 Binary files a/Assets/Resources/Fgui/Main/Main_fui.bytes and b/Assets/Resources/Fgui/Main/Main_fui.bytes differ diff --git a/Assets/Resources/Fgui/Shop/Shop_fui.bytes b/Assets/Resources/Fgui/Shop/Shop_fui.bytes index 5fff8245f..5bfacb64f 100644 Binary files a/Assets/Resources/Fgui/Shop/Shop_fui.bytes and b/Assets/Resources/Fgui/Shop/Shop_fui.bytes differ diff --git a/Assets/Scripts/Generate/Config/ItemConfig.cs b/Assets/Scripts/Generate/Config/ItemConfig.cs index dde2d596e..9dc56d02f 100644 --- a/Assets/Scripts/Generate/Config/ItemConfig.cs +++ b/Assets/Scripts/Generate/Config/ItemConfig.cs @@ -13,32 +13,20 @@ namespace NBF [ProtoContract] public sealed partial class ItemConfig : ASerialize, IProto, IConfigTable { - - [ProtoMember(1)] - public uint Id { get; set; } // Id - [ProtoMember(2)] - public string Model { get; set; } // 模型 - [ProtoMember(3)] - public uint Type { get; set; } // 类型 - [ProtoMember(4)] - public uint Quality { get; set; } // 品质 - [ProtoMember(5)] - public uint Brand { get; set; } // 品牌 - [ProtoMember(6)] - public uint Weight { get; set; } // 重量(克) - [ProtoMember(7)] - public uint Length { get; set; } // 长度（毫米） - [ProtoMember(8)] - public uint Max { get; set; } // 最大堆叠数量 - [ProtoMember(9)] - public uint AutoUse { get; set; } // 获得自动使用 - [ProtoMember(10)] - public uint Deal { get; set; } // 交易类型 - [ProtoIgnore] - public uint Key => Id; - + [ProtoMember(1)] public uint Id { get; set; } // Id + [ProtoMember(2)] public string Model { get; set; } // 模型 + [ProtoMember(3)] public uint Type { get; set; } // 类型 + [ProtoMember(4)] public uint Quality { get; set; } // 品质 + [ProtoMember(5)] public uint Brand { get; set; } // 品牌 + [ProtoMember(6)] public uint Weight { get; set; } // 重量(克) + [ProtoMember(7)] public uint Length { get; set; } // 长度（毫米） + [ProtoMember(8)] public uint Max { get; set; } // 最大堆叠数量 + [ProtoMember(9)] public uint AutoUse { get; set; } // 获得自动使用 + [ProtoMember(10)] public uint Deal { get; set; } // 交易类型 + [ProtoIgnore] public uint Key => Id; + #region Static - + private static ConfigContext Context => ConfigTableHelper.Table(); public static ItemConfig Get(uint key) @@ -50,7 +38,7 @@ namespace NBF { return Context.Get(match); } - + public static ItemConfig Fist() { return Context.Fist(); @@ -70,7 +58,7 @@ namespace NBF { return Context.Last(match); } - + public static int Count() { return Context.Count(); @@ -90,10 +78,12 @@ namespace NBF { return Context.GetList(match); } + public static void ParseJson(Newtonsoft.Json.Linq.JArray arr) { ConfigTableHelper.ParseLine(arr); } + #endregion } } \ No newline at end of file diff --git a/Assets/Scripts/UI/Bag/BagItem.Designer.cs b/Assets/Scripts/UI/Bag/BagItem.Designer.cs index 6a17e5e1c..eefe2c50b 100644 --- a/Assets/Scripts/UI/Bag/BagItem.Designer.cs +++ b/Assets/Scripts/UI/Bag/BagItem.Designer.cs @@ -12,6 +12,7 @@ namespace NBF public const string URL = "ui://hxr7rc7puq3a1h"; public GImage back; + public GImage Quality2; public GImage Quality; public override void ConstructFromXML(XML xml) @@ -19,6 +20,7 @@ namespace NBF base.ConstructFromXML(xml); back = (GImage)GetChild("back"); + Quality2 = (GImage)GetChild("Quality2"); Quality = (GImage)GetChild("Quality"); OnInited(); UILanguage.TrySetComponentLanguage(this); diff --git a/Assets/Scripts/UI/Bag/ItemDetailsPanel.Designer.cs b/Assets/Scripts/UI/Bag/ItemDetailsPanel.Designer.cs index f71d687b9..4658efa1c 100644 --- a/Assets/Scripts/UI/Bag/ItemDetailsPanel.Designer.cs +++ b/Assets/Scripts/UI/Bag/ItemDetailsPanel.Designer.cs @@ -22,8 +22,6 @@ namespace NBF public GComponent title; [AutoFind(Name = "modelBack")] public GImage modelBack; - [AutoFind(Name = "Quality2")] - public GImage Quality2; [AutoFind(Name = "Model")] public ModelTexture Model; [AutoFind(Name = "Content")] diff --git a/Config/Item.xlsx b/Config/Item.xlsx index dca64635d..0d7af8a5f 100644 Binary files a/Config/Item.xlsx and b/Config/Item.xlsx differ diff --git a/FGUIProject/assets/Common/Com/Back/Back2.xml b/FGUIProject/assets/Common/Com/Back/Back2.xml index 6da75d64f..427f7993c 100644 --- a/FGUIProject/assets/Common/Com/Back/Back2.xml +++ b/FGUIProject/assets/Common/Com/Back/Back2.xml @@ -1,7 +1,7 @@ - + diff --git a/FGUIProject/assets/Common/Images/Panels/BasicStroke.png b/FGUIProject/assets/Common/Images/Panels/BasicStroke.png index 6198654db..fdf920fb0 100644 Binary files a/FGUIProject/assets/Common/Images/Panels/BasicStroke.png and b/FGUIProject/assets/Common/Images/Panels/BasicStroke.png differ diff --git a/FGUIProject/assets/Common/Images/Panels/RarityBg.png b/FGUIProject/assets/Common/Images/Panels/RarityBg.png index 13aa7557b..e27f8e5b3 100644 Binary files a/FGUIProject/assets/Common/Images/Panels/RarityBg.png and b/FGUIProject/assets/Common/Images/Panels/RarityBg.png differ diff --git a/FGUIProject/assets/Common/Images/Panels/RarityBg2.png b/FGUIProject/assets/Common/Images/Panels/RarityBg2.png new file mode 100644 index 000000000..6635d9c2f Binary files /dev/null and b/FGUIProject/assets/Common/Images/Panels/RarityBg2.png differ diff --git a/FGUIProject/assets/Common/package.xml b/FGUIProject/assets/Common/package.xml index 321c6ca11..c3c39c605 100644 --- a/FGUIProject/assets/Common/package.xml +++ b/FGUIProject/assets/Common/package.xml @@ -114,7 +114,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -227,6 +227,11 @@ + + + + + \ No newline at end of file diff --git a/FGUIProject/assets/Main/Com/Items/BagItem.xml b/FGUIProject/assets/Main/Com/Items/BagItem.xml index 41e645179..17b0923a6 100644 --- a/FGUIProject/assets/Main/Com/Items/BagItem.xml +++ b/FGUIProject/assets/Main/Com/Items/BagItem.xml @@ -7,15 +7,14 @@ - - - + +