Game/Fishing2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
BobSong
2025-10-23 23:29:10 +08:00
parent baa54a3f04
commit 1c18e4a338
18 changed files with 42 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/Resources/Fgui/Common/Common_atlas0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.1 MiB

After

Width:  |  Height:  |  Size: 5.1 MiB

BIN
Assets/Resources/Fgui/Common/Common_fui.bytes
View File

Binary file not shown.

BIN
Assets/Resources/Fgui/Main/Main_fui.bytes
View File

Binary file not shown.

BIN
Assets/Resources/Fgui/Shop/Shop_fui.bytes
View File

Binary file not shown.

44
Assets/Scripts/Generate/Config/ItemConfig.cs
View File

@@ -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<ItemConfig> Context => ConfigTableHelper.Table<ItemConfig>();
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<ItemConfig>(arr);
}
#endregion
}
}

2
Assets/Scripts/UI/Bag/BagItem.Designer.cs generated
View File

@@ -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);

2
Assets/Scripts/UI/Bag/ItemDetailsPanel.Designer.cs generated
View File

@@ -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")]

BIN
Config/Item.xlsx
View File

Binary file not shown.

2
FGUIProject/assets/Common/Com/Back/Back2.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="1920,1080" extention="Label">
<displayList>
<image id="n37_gii7" name="back" src="r03ui6" fileName="Images/Panels/BasicPanel.png" xy="-1,0" size="1920,1080" color="#041c26">
<image id="n37_gii7" name="back" src="r03ui6" fileName="Images/Panels/BasicPanel.png" xy="0,0" size="1920,1080" color="#041c26">
<relation target="" sidePair="width-width,height-height"/>
</image>
</displayList>

BIN
FGUIProject/assets/Common/Images/Panels/BasicStroke.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 145 B

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
FGUIProject/assets/Common/Images/Panels/RarityBg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 228 B

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
FGUIProject/assets/Common/Images/Panels/RarityBg2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

9
FGUIProject/assets/Common/package.xml
View File

@@ -114,7 +114,7 @@
<image id="r03ui4" name="StrokeNoGlow.png" path="/Images/Panels/" exported="true"/>
<image id="r03ui5" name="Badge.png" path="/Images/Panels/" exported="true" scale="9grid" scale9grid="35,13,38,16"/>
<image id="r03ui6" name="BasicPanel.png" path="/Images/Panels/" exported="true" scale="9grid" scale9grid="8,8,16,16"/>
<image id="r03ui7" name="BasicStroke.png" path="/Images/Panels/" exported="true" scale="9grid" scale9grid="4,5,24,23"/>
<image id="r03ui7" name="BasicStroke.png" path="/Images/Panels/" exported="true" scale="9grid" scale9grid="6,5,3,3"/>
<image id="r03ui8" name="BubbleTagLeft.png" path="/Images/Panels/" exported="true"/>
<image id="r03ui9" name="BubbleTagRight.png" path="/Images/Panels/" exported="true"/>
<image id="r03uia" name="ChatBgLeft.png" path="/Images/Panels/" exported="true" scale="9grid" scale9grid="8,8,18,16"/>
@@ -122,7 +122,7 @@
<image id="r03uic" name="GradientRight.png" path="/Images/Panels/" exported="true" scale="9grid" scale9grid="310,1,8,30"/>
<image id="r03uid" name="GradientTop.png" path="/Images/Panels/" exported="true" scale="9grid" scale9grid="0,3,30,3"/>
<image id="r03uie" name="PanelNoGlow.png" path="/Images/Panels/" exported="true"/>
<image id="r03uif" name="RarityBg.png" path="/Images/Panels/" exported="true" scale="9grid" scale9grid="5,1,188,28"/>
<image id="r03uif" name="RarityBg.png" path="/Images/Panels/" exported="true" scale="9grid" scale9grid="5,5,92,7"/>
<image id="r03uig" name="StrokeGlow.png" path="/Images/Panels/" exported="true"/>
<image id="r03uih" name="CommunicationCircleOn06.png" path="/Images/Misc/"/>
<image id="r03uii" name="CommunicationCircleOn07.png" path="/Images/Misc/"/>
@@ -227,6 +227,11 @@
<component id="r6aumd" name="CommonTitle.xml" path="/Com/" exported="true"/>
<component id="nzfpme" name="BtnCommonIcon.xml" path="/Com/Buttons/" exported="true"/>
<component id="xd2fmf" name="Back2.xml" path="/Com/Back/" exported="true"/>
<image id="xd2fmg" name="GlowBtn.png" path="/Images/button/2/"/>
<image id="xd2fmh" name="GlowBtnDisabled.png" path="/Images/button/2/"/>
<image id="xd2fmi" name="GlowBtnHighlighted.png" path="/Images/button/2/"/>
<image id="xd2fmj" name="GlowBtnOver.png" path="/Images/button/2/"/>
<image id="xd2fmk" name="RarityBg2.png" path="/Images/Panels/" exported="true" scale="9grid" scale9grid="4,0,8,88"/>
</resources>
<publish name="" path="../Assets/Resources/Fgui/Common" packageCount="2" genCode="true"/>
</packageDescription>

5
FGUIProject/assets/Main/Com/Items/BagItem.xml
View File

@@ -7,15 +7,14 @@
<gearColor controller="button" pages="2,3,4,5,6,7" values="#5c748b|#8bf3ff|#8bf3ff|#8bf3ff|#6fa8c0|#6fa8c0"/>
<relation target="" sidePair="width-width,height-height"/>
</image>
<image id="n12_r03u" name="Quality" src="r03uif" fileName="Images/Panels/RarityBg.png" pkg="6hgkvlau" xy="43,3" pivot="0.5,0.5" size="194,280" alpha="0.6" rotation="-90" color="#44edbf">
<relation target="" sidePair="height-height,left-left"/>
</image>
<text id="n7_oome" name="title" xy="13,11" size="249,35" alpha="0.7" font="ui://6hgkvlaugkm7w" fontSize="23" color="#ffffff" vAlign="middle" autoSize="ellipsis" strokeColor="#ff6c00" text="Title">
<relation target="" sidePair="width-width,center-center,bottom-bottom"/>
</text>
<loader id="n13_r03u" name="icon" xy="40,67" size="200,160" align="center" vAlign="middle" fill="scale" shrinkOnly="true" clearOnPublish="true">
<relation target="" sidePair="center-center,top-top"/>
</loader>
<image id="n14_xd2f" name="Quality2" src="xd2fmk" fileName="Images/Panels/RarityBg2.png" pkg="6hgkvlau" xy="0,143" size="280,97" visible="false" alpha="0.6" color="#ff6c00"/>
<image id="n15_xd2f" name="Quality" src="kryob" fileName="Images/Square.png" pkg="6hgkvlau" xy="0,238" size="280,2" color="#ff6c00"/>
</displayList>
<Button mode="Radio"/>
</component>

9
FGUIProject/assets/Main/Component1.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="420,515">
<displayList>
<image id="n6_xd2f" name="n6" src="r03ui6" fileName="Images/Panels/BasicPanel.png" pkg="6hgkvlau" xy="0,0" size="420,515" color="#08101b"/>
<image id="n7_xd2f" name="n7" src="r03ui7" fileName="Images/Panels/BasicStroke.png" pkg="6hgkvlau" xy="0,0" size="420,515" alpha="0.3" color="#8bf3ff">
<relation target="n6_xd2f" sidePair="width-width,height-height,center-center,middle-middle"/>
</image>
</displayList>
</component>

3
FGUIProject/assets/Main/ItemDetailsPanel.xml
View File

@@ -13,9 +13,6 @@
<image id="n11_nzfp" name="modelBack" src="kryob" fileName="Images/Square.png" pkg="6hgkvlau" xy="62,144" size="820,820" alpha="0.1" color="#5c748b">
<relation target="n6_r6au" sidePair="width-width,height-height,center-center,middle-middle"/>
</image>
<image id="n9_nzfp" name="Quality2" src="r03uif" fileName="Images/Panels/RarityBg.png" pkg="6hgkvlau" xy="375,457" pivot="0.5,0.5" size="194,820" visible="false" alpha="0.333" rotation="-90" color="#ff6c00">
<relation target="n6_r6au" sidePair="left-left,top-top"/>
</image>
<component id="n6_r6au" name="Model" src="5dtxm9" fileName="Com/ModelTexture.xml" pkg="6hgkvlau" xy="62,144" size="820,820">
<relation target="" sidePair="left-left,top-top"/>
</component>

1
FGUIProject/assets/Main/package.xml
View File

@@ -60,6 +60,7 @@
<component id="nzfp1o" name="ItemDetailsContent.xml" path="/"/>
<component id="nzfp1p" name="ItemBasicInfoTag.xml" path="/Com/"/>
<component id="nzfp1q" name="ItemGearInfoTag.xml" path="/Com/"/>
<component id="xd2f1r" name="Component1.xml" path="/"/>
</resources>
<publish name="" path="../Assets/Resources/Fgui/Main" packageCount="2" genCode="true"/>
</packageDescription>

6
FGUIProject/assets/Shop/Com/ShopGearItem.xml
View File

@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="350,300" extention="Button">
<controller name="button" pages="2,up,3,down,4,over,5,selectedOver,6,disabled,7,selectedDisabled" selected="1"/>
<controller name="button" pages="2,up,3,down,4,over,5,selectedOver,6,disabled,7,selectedDisabled" selected="0"/>
<displayList>
<image id="n10_r03u" name="back" src="kryob" fileName="Images/Square.png" pkg="6hgkvlau" xy="0,0" size="350,300" alpha="0.15" color="#8bf3ff">
<image id="n10_r03u" name="back" src="kryob" fileName="Images/Square.png" pkg="6hgkvlau" xy="0,0" size="350,300" alpha="0.2" color="#5c748b">
<gearLook controller="button" pages="2,3,4,5" values="0.2,0,0,0|0.15,0,0,0|0.15,0,0,0|0.15,0,0,0" default="0.55,0,0,0"/>
<gearColor controller="button" pages="2,3,4,5,6,7" values="#5c748b|#8bf3ff|#8bf3ff|#8bf3ff|#6fa8c0|#6fa8c0"/>
<relation target="" sidePair="width-width,height-height"/>
</image>
<image id="n12_r03u" name="ba" src="r03uif" fileName="Images/Panels/RarityBg.png" pkg="6hgkvlau" xy="0,0" size="194,300" alpha="0.6" color="#ff6c00"/>
<image id="n12_r03u" name="ba" src="xd2fmk" fileName="Images/Panels/RarityBg2.png" pkg="6hgkvlau" xy="0,203" size="350,97" alpha="0.6" color="#ff6c00"/>
<text id="n7_oome" name="title" xy="18,7" size="323,32" alpha="0.7" fontSize="22" color="#ffffff" vAlign="middle" autoSize="ellipsis" text="Title"/>
<loader id="n13_r03u" name="n13" xy="50,55" size="250,190" align="center" vAlign="middle" fill="scale" clearOnPublish="true"/>
<text id="n15_r03u" name="n15" xy="237,246" size="57,29" alpha="0.7" fontSize="20" color="#d8fbff" align="right" text="50.99"/>