修改提交shop修改
This commit is contained in:
@@ -22830,8 +22830,8 @@ MonoBehaviour:
|
||||
Filter: '*'
|
||||
Bundles:
|
||||
- Name: main/ui.bundle
|
||||
Hash: f08e8dd58157955ebca6ffc7dbe79a1c
|
||||
Size: 7664401
|
||||
Hash: b5960cf3a8b37f3a62a4e92771a6be08
|
||||
Size: 7611844
|
||||
Assets:
|
||||
- Path: Assets/ResRaw/Fgui/Common/Common_atlas0.png
|
||||
Address: UI/Common_atlas0
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 971 KiB After Width: | Height: | Size: 1.0 MiB |
Binary file not shown.
Binary file not shown.
@@ -909,85 +909,6 @@ Transform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &869065583
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 869065584}
|
||||
- component: {fileID: 869065586}
|
||||
- component: {fileID: 869065585}
|
||||
m_Layer: 5
|
||||
m_Name: Text (Legacy)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &869065584
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 869065583}
|
||||
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: 1439106037}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: -20.035}
|
||||
m_SizeDelta: {x: 160, y: 70.0701}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &869065585
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 869065583}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 9ca2618301686b342867f34f731938f0, type: 3}
|
||||
m_FontSize: 32
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 2
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 0
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u9009\u9879"
|
||||
--- !u!222 &869065586
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 869065583}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &884989002
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1207,121 +1128,6 @@ Transform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
|
||||
--- !u!1 &1439106032
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1439106037}
|
||||
- component: {fileID: 1439106036}
|
||||
- component: {fileID: 1439106035}
|
||||
- component: {fileID: 1439106034}
|
||||
- component: {fileID: 1439106033}
|
||||
m_Layer: 5
|
||||
m_Name: Canvas
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &1439106033
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1439106032}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: b189222c6db8433db1239d314f92cf9f, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::DontDestroy
|
||||
--- !u!114 &1439106034
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1439106032}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.GraphicRaycaster
|
||||
m_IgnoreReversedGraphics: 1
|
||||
m_BlockingObjects: 0
|
||||
m_BlockingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4513599
|
||||
--- !u!114 &1439106035
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1439106032}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.CanvasScaler
|
||||
m_UiScaleMode: 0
|
||||
m_ReferencePixelsPerUnit: 100
|
||||
m_ScaleFactor: 1
|
||||
m_ReferenceResolution: {x: 800, y: 600}
|
||||
m_ScreenMatchMode: 0
|
||||
m_MatchWidthOrHeight: 0
|
||||
m_PhysicalUnit: 3
|
||||
m_FallbackScreenDPI: 96
|
||||
m_DefaultSpriteDPI: 96
|
||||
m_DynamicPixelsPerUnit: 1
|
||||
m_PresetInfoIsWorld: 0
|
||||
--- !u!223 &1439106036
|
||||
Canvas:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1439106032}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_RenderMode: 0
|
||||
m_Camera: {fileID: 0}
|
||||
m_PlaneDistance: 100
|
||||
m_PixelPerfect: 0
|
||||
m_ReceivesEvents: 1
|
||||
m_OverrideSorting: 0
|
||||
m_OverridePixelPerfect: 0
|
||||
m_SortingBucketNormalizedSize: 0
|
||||
m_VertexColorAlwaysGammaSpace: 0
|
||||
m_AdditionalShaderChannelsFlag: 0
|
||||
m_UpdateRectTransformForStandalone: 0
|
||||
m_SortingLayerID: 0
|
||||
m_SortingOrder: 0
|
||||
m_TargetDisplay: 0
|
||||
--- !u!224 &1439106037
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1439106032}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0, y: 0, z: 0}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 869065584}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 0}
|
||||
--- !u!1 &1729919008
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -2052,4 +1858,3 @@ SceneRoots:
|
||||
- {fileID: 1199298675}
|
||||
- {fileID: 646846706}
|
||||
- {fileID: 159075240}
|
||||
- {fileID: 1439106037}
|
||||
|
||||
@@ -70,7 +70,7 @@ namespace NBF
|
||||
string outputPath = $"{ProjectDir}/Release";
|
||||
|
||||
string location =
|
||||
$"{outputPath}/{_context.Ver}_{DateTime.Now:yyyyMMddHHmm}/Fishing.exe";
|
||||
$"{outputPath}/{_context.Ver}/Fishing.exe";
|
||||
BuildTarget activeTarget = EditorUserBuildSettings.activeBuildTarget;
|
||||
|
||||
switch (activeTarget)
|
||||
@@ -94,7 +94,7 @@ namespace NBF
|
||||
var buildOptions = BuildOptions.CompressWithLz4;
|
||||
BuildPlayerOptions buildPlayerOptions = new BuildPlayerOptions()
|
||||
{
|
||||
scenes = new[] { "Assets/Scenes/Main.unity" },
|
||||
scenes = new[] { "Assets/Scenes/StartUp.unity" },//Assets/Scenes/StartUp.unity
|
||||
locationPathName = location,
|
||||
options = buildOptions,
|
||||
target = activeTarget,
|
||||
|
||||
@@ -60,8 +60,8 @@ namespace NBF
|
||||
{
|
||||
// await Task.Delay(100);
|
||||
CommonTopPanel.Show();
|
||||
SettingPanel.Show();
|
||||
// LoginPanel.Show();
|
||||
// SettingPanel.Show();
|
||||
LoginPanel.Show();
|
||||
// PreviewPanel.Show();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,6 +35,7 @@ namespace NBC
|
||||
|
||||
public static void SetLanguage(this GObject child, string key, params object[] args)
|
||||
{
|
||||
if(string.IsNullOrEmpty(key)) return;
|
||||
if (Text == null) return;
|
||||
child.lang = key;
|
||||
|
||||
|
||||
@@ -31,7 +31,6 @@ namespace NBF
|
||||
tabItemList.Add(tabItem);
|
||||
}
|
||||
|
||||
ItemList.SetPanel(this);
|
||||
ItemList.SetData(tabItemList, true, true);
|
||||
}
|
||||
|
||||
|
||||
@@ -9,8 +9,6 @@ namespace NBF
|
||||
[UIExtensionAutoBind]
|
||||
public static void BindAll()
|
||||
{
|
||||
UIObjectFactory.SetPackageItemExtension(KeyboardInput.URL, typeof(KeyboardInput));
|
||||
UIObjectFactory.SetPackageItemExtension(SettingInputItem.URL, typeof(SettingInputItem));
|
||||
UIObjectFactory.SetPackageItemExtension(SettingItem.URL, typeof(SettingItem));
|
||||
UIObjectFactory.SetPackageItemExtension(IntroduceTag.URL, typeof(IntroduceTag));
|
||||
UIObjectFactory.SetPackageItemExtension(HomeMainPage.URL, typeof(HomeMainPage));
|
||||
|
||||
@@ -23,48 +23,19 @@ namespace NBF
|
||||
|
||||
private int _columnsCount;
|
||||
|
||||
public ListSelector _selector;
|
||||
public ListSelector Selector;
|
||||
|
||||
private void OnInited()
|
||||
{
|
||||
InputManager.OnUICanceled += OnUICanceled;
|
||||
List.onClickItem.Add(OnClickListItem);
|
||||
_selector = new ListSelector(List, typeof(ListTitleItem));
|
||||
Selector = new ListSelector(List, typeof(ListTitleItem));
|
||||
}
|
||||
|
||||
public override void Dispose()
|
||||
public void InvokeClickItem(object data)
|
||||
{
|
||||
InputManager.OnUICanceled -= OnUICanceled;
|
||||
base.Dispose();
|
||||
}
|
||||
|
||||
private void OnUICanceled(string action)
|
||||
{
|
||||
if (action == InputDef.UI.Right)
|
||||
{
|
||||
_selector.Right();
|
||||
}
|
||||
else if (action == InputDef.UI.Left)
|
||||
{
|
||||
_selector.Left();
|
||||
}
|
||||
else if (action == InputDef.UI.Up)
|
||||
{
|
||||
_selector.Up();
|
||||
}
|
||||
else if (action == InputDef.UI.Down)
|
||||
{
|
||||
_selector.Down();
|
||||
}
|
||||
else if (action == InputDef.UI.Enter)
|
||||
{
|
||||
var selectedItem = _selector.SelectedItem;
|
||||
if (selectedItem != null)
|
||||
{
|
||||
OnClickItem?.Invoke(selectedItem);
|
||||
}
|
||||
}
|
||||
OnClickItem?.Invoke(data);
|
||||
}
|
||||
|
||||
|
||||
public void SetListData(List<object> listData,
|
||||
ListSelectionMode selectionMode = ListSelectionMode.Single)
|
||||
@@ -93,7 +64,7 @@ namespace NBF
|
||||
}
|
||||
|
||||
_columnsCount = 6;
|
||||
_selector.Refresh();
|
||||
Selector.Refresh();
|
||||
}
|
||||
|
||||
void OnClickListItem(EventContext context)
|
||||
|
||||
@@ -15,11 +15,7 @@ namespace NBF
|
||||
private List<TabItemData> _tabList = new List<TabItemData>();
|
||||
private TabItemData _currentTab;
|
||||
|
||||
public void SetPanel(UIPanel panel)
|
||||
{
|
||||
Menu.SetPanel(panel);
|
||||
}
|
||||
|
||||
|
||||
private void OnInited()
|
||||
{
|
||||
Menu.OnTabChange += ChangeTab;
|
||||
|
||||
@@ -10,8 +10,6 @@ namespace NBF
|
||||
{
|
||||
public partial class BottomMenu : GComponent
|
||||
{
|
||||
private UIPanel _panel;
|
||||
|
||||
private void OnInited()
|
||||
{
|
||||
List.onClickItem.Add(OnClickItem);
|
||||
|
||||
@@ -12,46 +12,28 @@ namespace NBF
|
||||
public partial class CommonMenu : GLabel
|
||||
{
|
||||
public event Action<int> OnTabChange;
|
||||
private UIPanel _panel;
|
||||
|
||||
public void SetPanel(UIPanel panel)
|
||||
{
|
||||
_panel = panel;
|
||||
}
|
||||
|
||||
private void OnInited()
|
||||
{
|
||||
List.onClickItem.Add(OnClickItem);
|
||||
BtnPrev.onClick.Add(OnClickBtnPrev);
|
||||
BtnNext.onClick.Add(OnClickBtnNext);
|
||||
|
||||
InputManager.OnUICanceled += OnUICanceled;
|
||||
}
|
||||
|
||||
private string _leftActionName;
|
||||
private string _rightActionName;
|
||||
|
||||
public override void Dispose()
|
||||
public void SetBtnActionName(string leftActionName, string rightActionName)
|
||||
{
|
||||
InputManager.OnUICanceled -= OnUICanceled;
|
||||
base.Dispose();
|
||||
}
|
||||
|
||||
private void OnUICanceled(string action)
|
||||
{
|
||||
if (_panel == null) return;
|
||||
if (!_panel.IsShowing) return;
|
||||
if (!_panel.IsTop) return;
|
||||
if (action == InputDef.UI.Prev)
|
||||
{
|
||||
OnClickBtnPrev();
|
||||
}
|
||||
else if (action == InputDef.UI.Next)
|
||||
{
|
||||
OnClickBtnNext();
|
||||
}
|
||||
_leftActionName = leftActionName;
|
||||
_rightActionName = rightActionName;
|
||||
BtnPrev.SetData(leftActionName, string.Empty);
|
||||
BtnNext.SetData(rightActionName, string.Empty);
|
||||
}
|
||||
|
||||
public void SetTabs(List<TabItemData> tabList, int selectIndex = 0)
|
||||
{
|
||||
SetBtnActionName(InputDef.UI.Prev, InputDef.UI.Next);
|
||||
List.RemoveChildrenToPool();
|
||||
var listWidth = 0f;
|
||||
for (int i = 0; i < tabList.Count; i++)
|
||||
|
||||
@@ -36,8 +36,9 @@ namespace NBF
|
||||
// BagPanel.Show();
|
||||
// BagSlotPanel.Show();
|
||||
|
||||
// SettingPanel.Show();
|
||||
HomePanel.Show();
|
||||
// FishingShopPanel.Show();
|
||||
SettingPanel.Show();
|
||||
|
||||
Del();
|
||||
}
|
||||
|
||||
@@ -269,7 +269,7 @@ namespace NBF
|
||||
});
|
||||
}
|
||||
|
||||
[InputInvoke(InputDef.UI.Back, UIInputButtonShowMode.BottomRight, "返回")]
|
||||
[InputInvoke(InputDef.UI.Back, UIInputButtonShowMode.BottomRight)]
|
||||
private void OnBack()
|
||||
{
|
||||
if (Settings.Instance.HaveNotAppleSettings())
|
||||
|
||||
@@ -19,31 +19,14 @@ namespace NBF
|
||||
|
||||
protected override void OnShow()
|
||||
{
|
||||
InputManager.Instance.On(this);
|
||||
ItemList.List.OnClickItem += OnClickItem;
|
||||
InputManager.OnUICanceled += OnUICanceled;
|
||||
|
||||
List<TabItemData> tabItemList = GoodsConfigHelper.TabItemList;
|
||||
|
||||
ItemList.SetPanel(this);
|
||||
ItemList.SetData(tabItemList, true, true);
|
||||
}
|
||||
|
||||
private void OnUICanceled(string action)
|
||||
{
|
||||
if (!IsTop) return;
|
||||
if (action == InputDef.UI.SubPrev)
|
||||
{
|
||||
}
|
||||
else if (action == InputDef.UI.SubNext)
|
||||
{
|
||||
}
|
||||
else if (action == InputDef.UI.Up)
|
||||
{
|
||||
}
|
||||
else if (action == InputDef.UI.Down)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
private void OnClickItem(object item)
|
||||
{
|
||||
@@ -52,11 +35,69 @@ namespace NBF
|
||||
// ItemDetailsPanel.Show(bagItem.ItemInfo);
|
||||
ShopDetailsPanel.Show(gearItem.Config);
|
||||
}
|
||||
|
||||
|
||||
#region UI事件
|
||||
|
||||
[InputInvoke(InputDef.UI.Prev, UIInputButtonShowMode.MenuLeft)]
|
||||
private void OnPrev()
|
||||
{
|
||||
ItemList.Menu.OnClickBtnPrev();
|
||||
}
|
||||
|
||||
[InputInvoke(InputDef.UI.Next, UIInputButtonShowMode.MenuRight)]
|
||||
private void OnNext()
|
||||
{
|
||||
ItemList.Menu.OnClickBtnNext();
|
||||
}
|
||||
|
||||
[InputInvoke(InputDef.UI.Left, UIInputButtonShowMode.BottomLeft)]
|
||||
private void OnLeft()
|
||||
{
|
||||
ItemList.List.Selector.Left();
|
||||
}
|
||||
|
||||
[InputInvoke(InputDef.UI.Right, UIInputButtonShowMode.BottomLeft)]
|
||||
private void OnRight()
|
||||
{
|
||||
ItemList.List.Selector.Right();
|
||||
}
|
||||
|
||||
[InputInvoke(InputDef.UI.Up, UIInputButtonShowMode.BottomLeft)]
|
||||
private void OnUp()
|
||||
{
|
||||
ItemList.List.Selector.Up();
|
||||
// ChangeListSelected();
|
||||
}
|
||||
|
||||
[InputInvoke(InputDef.UI.Down, UIInputButtonShowMode.BottomLeft)]
|
||||
private void OnDown()
|
||||
{
|
||||
ItemList.List.Selector.Down();
|
||||
}
|
||||
|
||||
[InputInvoke(InputDef.UI.Enter, UIInputButtonShowMode.BottomLeft, "查看")]
|
||||
private void OnApplySettings()
|
||||
{
|
||||
var selectedItem = ItemList.List.Selector.SelectedItem;
|
||||
if (selectedItem != null)
|
||||
{
|
||||
ItemList.List.InvokeClickItem(selectedItem);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
[InputInvoke(InputDef.UI.Back, UIInputButtonShowMode.BottomRight)]
|
||||
private void OnBack()
|
||||
{
|
||||
Hide();
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
protected override void OnHide()
|
||||
{
|
||||
InputManager.OnUICanceled -= OnUICanceled;
|
||||
ItemList.List.OnClickItem -= OnClickItem;
|
||||
InputManager.Instance.Off(this);
|
||||
}
|
||||
|
||||
protected override void OnDestroy()
|
||||
|
||||
@@ -10,6 +10,45 @@ namespace NBF
|
||||
protected override void OnShow()
|
||||
{
|
||||
// Model.SetData(ItemInfo);
|
||||
InputManager.Instance.On(this);
|
||||
}
|
||||
|
||||
#region UI输入事件
|
||||
|
||||
[InputInvoke(InputDef.UI.Up, UIInputButtonShowMode.BottomLeft)]
|
||||
private void OnUp()
|
||||
{
|
||||
// ItemList.List.Selector.Up();
|
||||
// ChangeListSelected();
|
||||
}
|
||||
|
||||
[InputInvoke(InputDef.UI.Down, UIInputButtonShowMode.BottomLeft)]
|
||||
private void OnDown()
|
||||
{
|
||||
// ItemList.List.Selector.Down();
|
||||
}
|
||||
[InputInvoke(InputDef.UI.Enter, UIInputButtonShowMode.BottomLeft, "购买")]
|
||||
private void OnApplySettings()
|
||||
{
|
||||
// var selectedItem = ItemList.List.Selector.SelectedItem;
|
||||
// if (selectedItem != null)
|
||||
// {
|
||||
// ItemList.List.InvokeClickItem(selectedItem);
|
||||
// }
|
||||
}
|
||||
|
||||
|
||||
[InputInvoke(InputDef.UI.Back, UIInputButtonShowMode.BottomRight)]
|
||||
private void OnBack()
|
||||
{
|
||||
Hide();
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
protected override void OnHide()
|
||||
{
|
||||
InputManager.Instance.Off(this);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -41,7 +41,7 @@ namespace NBF
|
||||
tabItemList.Add(tabItem);
|
||||
}
|
||||
|
||||
ItemList.SetPanel(this);
|
||||
// ItemList.SetPanel(this);
|
||||
ItemList.SetData(tabItemList, true, true);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="1920,1007" designImage="ui://hxr7rc7pr03ue" designImageAlpha="0">
|
||||
<controller name="style" pages="1,oneMenu,2,twoMenu" selected="1">
|
||||
<controller name="style" pages="1,oneMenu,2,twoMenu" selected="0">
|
||||
<remark page="0" value="一级菜单"/>
|
||||
<remark page="1" value="二级菜单"/>
|
||||
</controller>
|
||||
@@ -11,9 +11,9 @@
|
||||
<component id="n25_r03u" name="SubMenu" src="r03us" fileName="Com/Menu/CommonSubMenu.xml" xy="76,128">
|
||||
<gearDisplay controller="style" pages="2"/>
|
||||
</component>
|
||||
<component id="n6_drkw" name="List" src="drkwh1" fileName="Com/ClassifyList.xml" xy="49,216" size="1846,790">
|
||||
<component id="n6_drkw" name="List" src="drkwh1" fileName="Com/ClassifyList.xml" xy="49,113" size="1846,892">
|
||||
<gearXY controller="style" pages="1,2" values="49,113|49,216"/>
|
||||
<gearSize controller="style" pages="1,2" values="1846,883,1,1|1846,790,1,1"/>
|
||||
<gearSize controller="style" pages="1,2" values="1846,892,1,1|1846,790,1,1"/>
|
||||
<relation target="" sidePair="width-width,top-top,bottomext-bottom"/>
|
||||
</component>
|
||||
</displayList>
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="1920,95" extention="Label" designImage="ui://6hgkvlaufcfgh0" designImageAlpha="0">
|
||||
<displayList>
|
||||
<image id="n13_r03u" name="n13" pkg="6hgkvlau" src="r03uij" fileName="Images/Misc/TopGlow.png" xy="222,0" size="1476,93" visible="false" alpha="0.2">
|
||||
<relation target="" sidePair="center-center,top-top"/>
|
||||
<image id="n14_r03u" name="n14" src="kryob" fileName="Images/Square.png" pkg="xo76q8wz" xy="0,93" pivot="0,1" size="1920,2" color="#323232">
|
||||
<relation target="" sidePair="width-width,bottom-bottom"/>
|
||||
</image>
|
||||
<list id="n15_vboj" name="List" xy="104,7" size="646,88" layout="row" overflow="hidden" scroll="horizontal" defaultItem="ui://6hgkvlauvbojt5" autoClearItems="true">
|
||||
<item title="主页"/>
|
||||
@@ -13,9 +13,8 @@
|
||||
<item title="设置"/>
|
||||
</list>
|
||||
<component id="n11_r03u" name="BtnPrev" src="r03ut" fileName="Com/Buttons/BtnInputControl.xml" xy="58,33"/>
|
||||
<component id="n12_r03u" name="BtnNext" src="r03ut" fileName="Com/Buttons/BtnInputControl.xml" xy="767,33"/>
|
||||
<image id="n14_r03u" name="n14" src="kryob" fileName="Images/Square.png" pkg="xo76q8wz" xy="0,93" pivot="0,1" size="1920,2" alpha="0.1" color="#323232">
|
||||
<relation target="" sidePair="width-width,bottom-bottom"/>
|
||||
</image>
|
||||
<component id="n12_r03u" name="BtnNext" src="r03ut" fileName="Com/Buttons/BtnInputControl.xml" xy="767,33">
|
||||
<relation target="n15_vboj" sidePair="middle-middle,right-right"/>
|
||||
</component>
|
||||
</displayList>
|
||||
</component>
|
||||
@@ -1,13 +1,13 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="100,88" extention="Button">
|
||||
<controller name="button" pages="2,up,3,down,4,over,5,selectedOver" selected="1"/>
|
||||
<controller name="button" pages="2,up,3,down,4,over,5,selectedOver" selected="0"/>
|
||||
<displayList>
|
||||
<image id="n4_vboj" name="n4" src="vbojsb" fileName="ImagesNew/Glow/glow_horizontal/glow_horizontal_1.png" xy="0,0" size="100,88" alpha="0.2" color="#07acda">
|
||||
<gearDisplay controller="button" pages="3,4,5"/>
|
||||
<relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
|
||||
</image>
|
||||
<image id="n3_vboj" name="n3" src="vbojpz" fileName="ImagesNew/Line/line_h.png" xy="0,86" size="100,2" color="#07acda">
|
||||
<gearDisplay controller="button" pages="3,5"/>
|
||||
<gearDisplay controller="button" pages="3,4,5"/>
|
||||
<relation target="" sidePair="width-width,center-center,bottom-bottom"/>
|
||||
</image>
|
||||
<text id="n10_vboj" name="title" xy="26,27" pivot="0.5,0.5" size="47,32" fontSize="22" color="#e4dbdb" align="center" vAlign="middle" text="主页">
|
||||
|
||||
@@ -242,10 +242,10 @@
|
||||
<image id="vbojre" name="glow_out_square_6.png" path="/ImagesNew/Glow/glow_out_square/"/>
|
||||
<image id="vbojrf" name="glow_round_1.png" path="/ImagesNew/Glow/glow_round/"/>
|
||||
<image id="vbojrg" name="glow_round_10.png" path="/ImagesNew/Glow/glow_round/"/>
|
||||
<image id="vbojrh" name="glow_round_2.png" path="/ImagesNew/Glow/glow_round/"/>
|
||||
<image id="vbojri" name="glow_round_3.png" path="/ImagesNew/Glow/glow_round/"/>
|
||||
<image id="vbojrh" name="glow_round_2.png" path="/ImagesNew/Glow/glow_round/" exported="true"/>
|
||||
<image id="vbojri" name="glow_round_3.png" path="/ImagesNew/Glow/glow_round/" exported="true"/>
|
||||
<image id="vbojrj" name="glow_round_4.png" path="/ImagesNew/Glow/glow_round/"/>
|
||||
<image id="vbojrk" name="glow_round_5.png" path="/ImagesNew/Glow/glow_round/"/>
|
||||
<image id="vbojrk" name="glow_round_5.png" path="/ImagesNew/Glow/glow_round/" exported="true"/>
|
||||
<image id="vbojrl" name="glow_round_6.png" path="/ImagesNew/Glow/glow_round/"/>
|
||||
<image id="vbojrm" name="glow_round_7.png" path="/ImagesNew/Glow/glow_round/"/>
|
||||
<image id="vbojrn" name="glow_round_8.png" path="/ImagesNew/Glow/glow_round/"/>
|
||||
@@ -258,7 +258,7 @@
|
||||
<image id="vbojru" name="glow_square_8.png" path="/ImagesNew/Glow/glow_square/"/>
|
||||
<image id="vbojrv" name="glow_out_round_5.png" path="/ImagesNew/Glow/glow_out_round/"/>
|
||||
<image id="vbojrw" name="glow_square_7.png" path="/ImagesNew/Glow/glow_square/"/>
|
||||
<image id="vbojrx" name="glow_square_5.png" path="/ImagesNew/Glow/glow_square/"/>
|
||||
<image id="vbojrx" name="glow_square_5.png" path="/ImagesNew/Glow/glow_square/" exported="true"/>
|
||||
<image id="vbojry" name="glow_square_4.png" path="/ImagesNew/Glow/glow_square/"/>
|
||||
<image id="vbojrz" name="glow_square_3.png" path="/ImagesNew/Glow/glow_square/"/>
|
||||
<image id="vbojs0" name="glow_square_2.png" path="/ImagesNew/Glow/glow_square/"/>
|
||||
@@ -272,7 +272,7 @@
|
||||
<image id="vbojs8" name="glow_horizontal_4.png" path="/ImagesNew/Glow/glow_horizontal/" scale="9grid" scale9grid="32,0,64,128"/>
|
||||
<image id="vbojs9" name="glow_horizontal_3.png" path="/ImagesNew/Glow/glow_horizontal/" scale="9grid" scale9grid="32,0,64,41"/>
|
||||
<image id="vbojsa" name="glow_horizontal_2.png" path="/ImagesNew/Glow/glow_horizontal/"/>
|
||||
<image id="vbojsb" name="glow_horizontal_1.png" path="/ImagesNew/Glow/glow_horizontal/" scale="9grid" scale9grid="32,74,64,53"/>
|
||||
<image id="vbojsb" name="glow_horizontal_1.png" path="/ImagesNew/Glow/glow_horizontal/" exported="true" scale="9grid" scale9grid="32,74,64,50" duplicatePadding="true"/>
|
||||
<image id="vbojsc" name="glow_circle_9.png" path="/ImagesNew/Glow/glow_circle/"/>
|
||||
<image id="vbojsd" name="glow_horizontal_6.png" path="/ImagesNew/Glow/glow_horizontal/"/>
|
||||
<image id="vbojse" name="glow_circle_8.png" path="/ImagesNew/Glow/glow_circle/"/>
|
||||
|
||||
BIN
FGUIProject/assets/Main/Assets/效果图/商店/20260201110006_1.jpg
Normal file
BIN
FGUIProject/assets/Main/Assets/效果图/商店/20260201110006_1.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 125 KiB |
@@ -1,13 +1,13 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="410,242" extention="Button">
|
||||
<controller name="button" pages="2,up,3,down,4,over,5,selectedOver" selected="3"/>
|
||||
<controller name="button" pages="2,up,3,down,4,over,5,selectedOver" selected="0"/>
|
||||
<displayList>
|
||||
<image id="n37_gii7" name="n37" src="kryob" fileName="Images/Square.png" pkg="xo76q8wz" xy="0,0" size="410,241" alpha="0.2" color="#5c748b"/>
|
||||
<loader id="n36_lvql" name="n36" xy="0,0" size="410,242" url="ui://6hgkvlau9n0dma" align="center" vAlign="middle" fill="scaleFree" color="#d8fbff">
|
||||
<image id="n37_gii7" name="n37" src="kryob" fileName="Images/Square.png" pkg="xo76q8wz" xy="0,0" size="410,241" alpha="0.2" color="#323232"/>
|
||||
<loader id="n36_lvql" name="n36" xy="0,0" size="410,242" url="ui://6hgkvlau9n0dm8" align="center" vAlign="middle" fill="scaleFree" color="#d8fbff">
|
||||
<gearIcon controller="button" pages="2,3,4,5" values="ui://6hgkvlau9n0dm8|ui://6hgkvlau9n0dma|ui://6hgkvlau9n0dmb|ui://6hgkvlau9n0dma"/>
|
||||
<relation target="" sidePair="width-width,height-height"/>
|
||||
</loader>
|
||||
<text id="n34_lvql" name="title" xy="180,104" size="49,34" fontSize="24" color="#d8fbff" align="center" vAlign="middle" text="title"/>
|
||||
<text id="n34_lvql" name="title" xy="180,104" size="49,34" fontSize="24" color="#ffffff" align="center" vAlign="middle" text="title"/>
|
||||
</displayList>
|
||||
<Button mode="Radio"/>
|
||||
</component>
|
||||
@@ -1,13 +1,13 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="356,112" pivot="0.5,0.5" extention="Button">
|
||||
<controller name="button" pages="2,up,3,down,4,over,5,selectedOver" selected="3"/>
|
||||
<controller name="button" pages="2,up,3,down,4,over,5,selectedOver" selected="0"/>
|
||||
<displayList>
|
||||
<image id="n36_lvql" name="n36" src="kryob" fileName="Images/Square.png" pkg="xo76q8wz" xy="0,0" size="356,112" alpha="0.2" color="#5c748b"/>
|
||||
<loader id="n38_lvql" name="n38" xy="0,0" size="356,112" url="ui://6hgkvlau9n0dma" align="center" vAlign="middle" fill="scaleFree" color="#d8fbff">
|
||||
<image id="n36_lvql" name="n36" src="kryob" fileName="Images/Square.png" pkg="xo76q8wz" xy="0,0" size="356,112" alpha="0.2" color="#323232"/>
|
||||
<loader id="n38_lvql" name="n38" xy="0,0" size="356,112" url="ui://6hgkvlau9n0dm8" align="center" vAlign="middle" fill="scaleFree" color="#d8fbff">
|
||||
<gearIcon controller="button" pages="2,3,4,5" values="ui://6hgkvlau9n0dm8|ui://6hgkvlau9n0dma|ui://6hgkvlau9n0dmb|ui://6hgkvlau9n0dma"/>
|
||||
</loader>
|
||||
<loader id="n33_lvql" name="icon" xy="253,11" size="90,90" url="ui://hxr7rc7plvqlr" align="center" vAlign="middle" fill="scale" color="#d8fbff"/>
|
||||
<text id="n34_lvql" name="title" xy="16,17" size="217,73" fontSize="25" color="#d8fbff" vAlign="middle" autoSize="none" text="设置"/>
|
||||
<loader id="n33_lvql" name="icon" xy="253,11" size="90,90" url="ui://hxr7rc7plvqlr" align="center" vAlign="middle" fill="scale"/>
|
||||
<text id="n34_lvql" name="title" xy="16,17" size="217,73" fontSize="25" color="#ffffff" vAlign="middle" autoSize="none" text="设置"/>
|
||||
</displayList>
|
||||
<Button mode="Radio"/>
|
||||
</component>
|
||||
@@ -1,18 +1,31 @@
|
||||
<?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="0"/>
|
||||
<component size="284,320" overflow="hidden" extention="Button" designImage="ui://hxr7rc7pcmiv2c" designImageOffsetX="-175" designImageOffsetY="-539" designImageAlpha="0">
|
||||
<controller name="button" pages="2,up,3,down,4,over,5,selectedOver,6,disabled,7,selectedDisabled" selected="2"/>
|
||||
<displayList>
|
||||
<image id="n10_r03u" name="back" src="kryob" fileName="Images/Square.png" pkg="xo76q8wz" 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"/>
|
||||
<image id="n10_r03u" name="back" src="mbu9yj" fileName="ImagesNew/Square/mini/square20_stroke1px.png" pkg="6hgkvlau" xy="0,0" size="284,320">
|
||||
<gearLook controller="button" pages="2,3,4,5" values="1,0,0,0|1,0,0,0|1,0,0,0|1,0,0,0" default="0.8,0,0,0"/>
|
||||
<gearColor controller="button" pages="2,3,4,5,6,7" values="#727270|#ffffff|#ffffff|#ffffff|#6fa8c0|#6fa8c0"/>
|
||||
<relation target="" sidePair="width-width,height-height"/>
|
||||
</image>
|
||||
<text id="n7_oome" name="title" xy="18,7" size="314,32" alpha="0.7" fontSize="22" color="#ffffff" vAlign="middle" autoSize="ellipsis" text="Title"/>
|
||||
<loader id="n13_r03u" name="icon" xy="50,50" size="250,190" align="center" vAlign="middle" fill="scale" clearOnPublish="true"/>
|
||||
<text id="n15_r03u" name="TextPrice" xy="283,252" pivot="1,1" size="27,29" alpha="0.7" fontSize="20" color="#d8fbff" align="right" text="11"/>
|
||||
<loader id="n16_r03u" name="n16" xy="312,257" size="20,20" url="ui://xo76q8wzr03uj9" align="center" vAlign="middle" fill="scale" color="#8bf3ff"/>
|
||||
<image id="n17_fpwl" name="Quality" src="kryob" fileName="Images/Square.png" pkg="xo76q8wz" xy="0,298" size="350,2" color="#ff6c00"/>
|
||||
<text id="n18_fpwl" name="TextAmount" xy="18,252" size="75,29" alpha="0.7" fontSize="20" color="#d8fbff" align="right" text="个数:1"/>
|
||||
<image id="n19_cmiv" name="n19" src="vbojnh" fileName="ImagesNew/Square/square128_fill.png" pkg="6hgkvlau" xy="0,0" size="284,320" alpha="0.15" color="#afb0ab">
|
||||
<gearLook controller="button" pages="3,4,5" values="0.1,0,0,0|0.15,0,0,0|0.1,0,0,0" default="0.2,0,0,0"/>
|
||||
<gearColor controller="button" pages="3,4,5" values="#afb0ab|#afb0ab|#afb0ab" default="#323232"/>
|
||||
<relation target="" sidePair="width-width,height-height"/>
|
||||
</image>
|
||||
<text id="n7_oome" name="title" xy="24,7" size="242,32" fontSize="22" color="#e9e9e9" autoSize="height" text="Title"/>
|
||||
<loader id="n13_r03u" name="icon" xy="42,66" size="200,200" align="center" vAlign="middle" fill="scale" clearOnPublish="true">
|
||||
<relation target="" sidePair="center-center,middle-middle"/>
|
||||
</loader>
|
||||
<text id="n15_r03u" name="TextPrice" xy="217,280" pivot="1,1" size="27,29" fontSize="20" color="#e1e0dc" align="right" text="11">
|
||||
<relation target="" sidePair="right-right,bottom-bottom"/>
|
||||
</text>
|
||||
<loader id="n16_r03u" name="n16" xy="246,285" size="20,20" url="ui://xo76q8wzr03uj9" align="center" vAlign="middle" fill="scale" color="#8bf3ff">
|
||||
<relation target="" sidePair="right-right,bottom-bottom"/>
|
||||
</loader>
|
||||
<image id="n17_fpwl" name="Quality" src="kryob" fileName="Images/Square.png" pkg="xo76q8wz" xy="13,14" size="4,20" color="#ff6c00"/>
|
||||
<text id="n18_fpwl" name="TextAmount" xy="18,280" size="75,29" fontSize="20" color="#e9e9e9" align="right" text="个数:1">
|
||||
<relation target="" sidePair="left-left,bottom-bottom"/>
|
||||
</text>
|
||||
</displayList>
|
||||
<Button mode="Radio"/>
|
||||
</component>
|
||||
@@ -4,7 +4,7 @@
|
||||
<component id="n36_gii7" name="n36" src="8hy8la" fileName="Com/Back/Back1.xml" pkg="6hgkvlau" xy="0,0">
|
||||
<relation target="" sidePair="width-width,height-height"/>
|
||||
</component>
|
||||
<component id="n34_9mf1" name="BottomMenu" src="9mf1z" fileName="Com/Menu/BottomMenu.xml" pkg="6hgkvlau" xy="-1,1015" size="1920,65">
|
||||
<component id="n34_9mf1" name="BottomMenu" src="9mf1z" fileName="Com/Menu/BottomMenu.xml" pkg="6hgkvlau" xy="-1,1014">
|
||||
<relation target="" sidePair="width-width,bottom-bottom"/>
|
||||
</component>
|
||||
<component id="n37_10h9m" name="ItemList" src="p1fps" fileName="Com/List/CommonItemList.xml" pkg="6hgkvlau" xy="0,0">
|
||||
|
||||
@@ -102,6 +102,7 @@
|
||||
<component id="mbu929" name="CommonComboBox.xml" path="/Settings/" exported="true"/>
|
||||
<image id="j2ni2a" name="等待输入.jpg" path="/Assets/效果图/设置/"/>
|
||||
<component id="j2ni2b" name="SettingWaitInputPanel.xml" path="/Settings/" exported="true"/>
|
||||
<image id="cmiv2c" name="20260201110006_1.jpg" path="/Assets/效果图/商店/"/>
|
||||
</resources>
|
||||
<publish name="" path="../Assets/ResRaw/Fgui/Main" packageCount="2" genCode="true"/>
|
||||
</packageDescription>
|
||||
@@ -6,10 +6,11 @@
|
||||
"colorScheme": [
|
||||
"主色调蓝 #07ACDA",
|
||||
"分割线 #323232",
|
||||
"Item文字 #E1E0DC",
|
||||
"普通文字 #E9E9E9",
|
||||
"Item文字#f1f2f4",
|
||||
"边框 #464646",
|
||||
"边框选中 #AFB0AB",
|
||||
"边框2 #727270",
|
||||
"普通文字颜色 #9d9d9d",
|
||||
"二级导航背景 #CCCCCC",
|
||||
"二级导航文字默认 #6B6D6C",
|
||||
|
||||
@@ -3,13 +3,13 @@
|
||||
--- !u!159 &1
|
||||
EditorSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 14
|
||||
serializedVersion: 15
|
||||
m_SerializationMode: 2
|
||||
m_LineEndingsForNewScripts: 0
|
||||
m_DefaultBehaviorMode: 0
|
||||
m_PrefabRegularEnvironment: {fileID: 0}
|
||||
m_PrefabUIEnvironment: {fileID: 0}
|
||||
m_SpritePackerMode: 0
|
||||
m_SpritePackerMode: 4
|
||||
m_SpritePackerCacheSize: 10
|
||||
m_SpritePackerPaddingPower: 1
|
||||
m_Bc7TextureCompressor: 0
|
||||
@@ -47,3 +47,4 @@ EditorSettings:
|
||||
m_CacheServerDownloadBatchSize: 128
|
||||
m_EnableEnlightenBakedGI: 0
|
||||
m_ReferencedClipsExactNaming: 1
|
||||
m_ForceAssetUnloadAndGCOnSceneLoad: 1
|
||||
|
||||
Reference in New Issue
Block a user