背包

FGUIProject/assets/Bag/BagUI.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <displayList>
+    <loader id="n13_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
+      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+    </loader>
+    <list id="n0_lh8v" name="list" xy="56,266" size="978,1433" layout="flow_hz" overflow="scroll" lineGap="-30" colGap="20" defaultItem="ui://eg2y0ldpj48o98" align="center" autoClearItems="true">
+      <relation target="" sidePair="center-center,top-top,bottomext-bottom"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n5_wet2" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="159,90">
+      <relation target="" sidePair="right-right,top-top"/>
+    </component>
+    <component id="n6_wet2" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80">
+      <relation target="" sidePair="left-left,top-top"/>
+    </component>
+  </displayList>
+</component>

FGUIProject/assets/Bag/components/ComSelect.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="221,280">
+  <displayList>
+    <image id="n6_ohbx" name="n6" src="ohbx15" fileName="images/gxhd_gd_dik.png" xy="14,-1"/>
+  </displayList>
+</component>

FGUIProject/assets/Bag/package.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packageDescription id="2bsz6nel">
+  <resources>
+    <component id="ohbxn" name="BagUI.xml" path="/" exported="true"/>
+    <image id="ohbx15" name="gxhd_gd_dik.png" path="/images/" exported="true"/>
+    <component id="ohbxti2" name="ComSelect.xml" path="/components/" exported="true"/>
+  </resources>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\Bag" packageCount="2" genCode="true"/>
+</packageDescription>

FGUIProject/assets/Main/MainUI.xml

@@ -58,6 +58,7 @@
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kndrd7k" name="btnStore"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kjj4dfe" name="btnStudio"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kjj4dff" name="btnField"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kwg7t8x" name="btnBag"/>
     </list>
     <component id="n43_wg7t" name="btnChange" src="wg7t8z" fileName="components/ButtonChange.xml" xy="32,1754">
       <relation target="" sidePair="bottom-bottom"/>

GameClient/Assets/Game/HotUpdate/Data/BagDataManager.cs

@@ -0,0 +1,82 @@
+using System.Collections.Generic;
+using System.Linq;
+using GFGGame;
+
+namespace GFGGame
+{
+    public class BagDataManager : SingletonBase<BagDataManager>
+    {
+        private Dictionary<int, ItemData> _bagDataDic = new Dictionary<int, ItemData>();//背包数据字典
+        private List<ItemData> _bagDatas = new List<ItemData>();//背包数据列表
+        public List<ItemData> BagDatas
+        {
+            get
+            {
+                return _bagDatas;
+            }
+        }
+        public void Add(ItemData itemData)
+        {
+            if (!_bagDataDic.ContainsKey(itemData.id))
+            {
+                _bagDataDic.Add(itemData.id, itemData);
+            }
+            else
+            {
+                _bagDataDic[itemData.id] = itemData;
+            }
+            SetBagDatas();
+        }
+        public void Remove(int itemId)
+        {
+            if (!_bagDataDic.ContainsKey(itemId))
+            {
+                _bagDataDic.Remove(itemId);
+                SetBagDatas();
+            }
+        }
+        private void SetBagDatas()
+        {
+            _bagDatas = _bagDataDic.Values.ToList<ItemData>();
+            _bagDatas.Sort((ItemData a, ItemData b) =>
+            {
+                ItemCfg itemCfgA = ItemCfgArray.Instance.GetCfg(a.id);
+                ItemCfg itemCfgB = ItemCfgArray.Instance.GetCfg(b.id);
+                if (itemCfgB.useType > itemCfgA.useType)
+                {
+                    return -1;
+                }
+                else if (itemCfgB.rarity > itemCfgA.rarity)
+                {
+                    return -1;
+                }
+                return itemCfgB.id - itemCfgA.id;
+            });
+        }
+
+        public int GetItemIndex(int itemId, int curSelectIndex)
+        {
+            if (_bagDataDic.Count == 0) return -1;//背包无数数据
+            if (itemId < 0 || curSelectIndex < 0) return 0;//未选中物品，默认选中第一个
+            if (!_bagDataDic.ContainsKey(itemId))//已选中物品但背包无数据
+            {
+                if (curSelectIndex < _bagDatas.Count)
+                {
+                    return curSelectIndex;
+                }
+                else
+                {
+                    return _bagDatas.Count - 1;
+                }
+            }
+            else//已选中物品且背包有数据
+            {
+                for (int i = 0; i < _bagDatas.Count; i++)
+                {
+                    if (_bagDatas[i].id == itemId) return i;
+                }
+                return 0;
+            }
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Data/BagDataManager.cs.meta

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

GameClient/Assets/Game/HotUpdate/Data/ItemDataManager.cs

@@ -54,6 +54,10 @@ namespace GFGGame
                     FunctionOpenDataManager.Instance.CheckHasSpecialFunOpen();
                 }
             }
+            if (itemCfg.itemType == ConstItemType.ITEM)
+            {
+                BagDataManager.Instance.Add(itemData);
+            }
             PhotographDataManager.Instance.Add(itemID);
             EventAgent.DispatchEvent(ConstMessage.ITEM_CHANGED, itemID);
         }
@@ -81,6 +85,10 @@ namespace GFGGame
                 {
                     DecomposeDataManager.Instance.Remove(itemID);
                 }
+                if (itemCfg.itemType == ConstItemType.ITEM)
+                {
+                    BagDataManager.Instance.Remove(itemID);
+                }
                 EventAgent.DispatchEvent(ConstMessage.ITEM_CHANGED, itemID);
             }
         }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Bag.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4f432ed01f13e444cbe1bab805fea1bb
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Bag/UI_BagUI.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Bag
+{
+    public partial class UI_BagUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GList m_list;
+        public GComponent m_comValueBar;
+        public GButton m_btnback;
+        public const string URL = "ui://2bsz6nelohbxn";
+        public const string PACKAGE_NAME = "Bag";
+        public const string RES_NAME = "BagUI";
+        private static UI_BagUI _proxy;
+
+        public static UI_BagUI Create(GObject gObject = null)
+        {
+            var ui = new UI_BagUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_BagUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_BagUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_list = (GList)comp.GetChild("list");
+            m_comValueBar = (GComponent)comp.GetChild("comValueBar");
+            m_btnback = (GButton)comp.GetChild("btnback");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_list = null;
+            m_comValueBar = null;
+            m_btnback = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Bag/UI_BagUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/Bag.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8b14654d4ab9a14468faa94ec7b9df5a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/Views/Bag/BagView.cs

@@ -0,0 +1,139 @@
+
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.Bag;
+using UI.CommonGame;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class BagView : BaseWindow
+    {
+        private UI_BagUI _ui;
+        private ValueBarController _valueBarController;
+        private GComponent _imgSelected;
+        private List<ItemView> _listItemViews = new List<ItemView>();
+        private int _curItemId = -1;
+        public override void Dispose()
+        {
+            base.Dispose();
+            if (_valueBarController != null)
+            {
+                _valueBarController.Dispose();
+                _valueBarController = null;
+            }
+            for (int i = 0; i < _listItemViews.Count; i++)
+            {
+                _listItemViews[i].Dispose();
+                _listItemViews[i] = null;
+            }
+
+            if (_imgSelected != null)
+            {
+                _imgSelected.RemoveFromParent();
+                _imgSelected.Dispose();
+            }
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+
+            packageName = UI_BagUI.PACKAGE_NAME;
+            _ui = UI_BagUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            _valueBarController = new ValueBarController(_ui.m_comValueBar);
+
+            _ui.m_btnback.onClick.Add(OnBtnBackClick);
+            _ui.m_list.itemRenderer = ListItemRender;
+            _ui.m_list.onClickItem.Add(OnListItemClick);
+
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("mrqd_bjbj");
+
+            _imgSelected = new GComponent();
+            _imgSelected = UIPackage.CreateObject(UI_BagUI.PACKAGE_NAME, "ComSelect").asCom;
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, UpdateList);
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _valueBarController.OnShown();
+
+            UpdateList();
+        }
+
+        protected override void OnHide()
+        {
+            _valueBarController.OnHide();
+            _ui.m_list.numItems = 0;
+            base.OnHide();
+        }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, UpdateList);
+        }
+        private void UpdateList()
+        {
+            _ui.m_list.numItems = BagDataManager.Instance.BagDatas.Count;
+            int index = BagDataManager.Instance.GetItemIndex(_curItemId, _ui.m_list.selectedIndex);
+
+            if (index >= 0)
+            {
+                _ui.m_list.selectedIndex = index;
+                int childIndex = _ui.m_list.ItemIndexToChildIndex(index);
+                GComponent comItem = _ui.m_list.GetChildAt(childIndex).asCom;
+                ChangeSelect(comItem);
+            }
+        }
+
+        private void ListItemRender(int index, GObject obj)
+        {
+            ItemData itemData = BagDataManager.Instance.BagDatas[index];
+            if (obj.data == null)
+            {
+                ItemView itemView = new ItemView(obj as GComponent);
+                obj.data = itemView;
+                _listItemViews.Add(itemView);
+            }
+            (obj.data as ItemView).SetData(itemData);
+            (obj.data as ItemView).ShowName = false;
+            (obj.data as ItemView).ShowHasCount = false;
+            (obj.data as ItemView).ShowTips = false;
+        }
+
+        private void OnListItemClick(EventContext context)
+        {
+            GComponent comItem = (context.data as GComponent);
+            ItemView itemData = comItem.data as ItemView;
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemData.ItemData.id);
+            if (itemCfg.useType == 0)
+            {
+                GoodsItemTipsController.ShowItemTips(itemCfg.id);
+            }
+            ChangeSelect(comItem);
+        }
+        private void ChangeSelect(GComponent comItem)
+        {
+            comItem.AddChildAt(_imgSelected, 0);
+        }
+
+        private void OnBtnBackClick()
+        {
+            ViewManager.GoBackFrom(typeof(BagView).FullName);
+        }
+
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/Bag/BagView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/CommonGame/ItemView.cs

@@ -32,16 +32,19 @@ namespace GFGGame
             _imgHas = obj.GetChild("imgHas") as GImage;
             _loaShouTongRewardVisble = obj.GetChild("loaShouTongReward") as GLoader;
             _grpCount = obj.GetChild("grpCount") as GGroup;
-            AddClickListener();
+            // AddClickListener();
+            _obj.onClick.Remove(AddClickListener);
+            _obj.onClick.Add(AddClickListener);
+        }
+        public void Dispose()
+        {
+            _obj.onClick.Remove(AddClickListener);
+            _obj.Dispose();
         }
-
         private void AddClickListener()
         {
-            _obj.onClick.Add(() =>
-            {
-                if (!ShowTips) return;
-                GoodsItemTipsController.ShowItemTips(_itemData.id);
-            });
+            if (!ShowTips) return;
+            GoodsItemTipsController.ShowItemTips(_itemData.id);
         }
 
         public void SetData(ItemData itemData)
@@ -66,6 +69,14 @@ namespace GFGGame
             _txtHasCount.SetVar("count", "" + ItemDataManager.GetItemNum(_itemData.id)).FlushVars();
         }
 
+
+        public ItemData ItemData
+        {
+            get
+            {
+                return _itemData;
+            }
+        }
         /// <summary>
         /// “已领取”显示状态
         /// </summary>
@@ -114,10 +125,10 @@ namespace GFGGame
 
 
         /// <summary>
-        /// "已拥有"显示状态
+        /// 显示拥有数量
         /// </summary>
         /// <value></value>
-        public bool TxtHasCountVisble
+        public bool ShowHasCount
         {
             get
             {
@@ -129,7 +140,11 @@ namespace GFGGame
             }
         }
 
-        public bool LoaShouTongRewardVisble
+        /// <summary>
+        /// 显示首通奖励标志
+        /// </summary>
+        /// <value></value>
+        public bool ShowShouTongSign
         {
             get
             {
@@ -141,6 +156,17 @@ namespace GFGGame
             }
         }
         /// <summary>
+        /// 显示mingz
+        /// </summary>
+        /// <value></value>
+        public bool ShowName
+        {
+            set
+            {
+                _txtName.visible = value;
+            }
+        }
+        /// <summary>
         /// 显示数量
         /// </summary>
         /// <value></value>

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitPartsDetailView.cs

@@ -75,7 +75,7 @@ namespace GFGGame
                 itemViews.Add(itemView);
             }
             itemViews[index].SetData(reward);
-            itemViews[index].TxtHasCountVisble = false;
+            itemViews[index].ShowHasCount = false;
             bool haveItem = DressUpMenuItemDataManager.CheckHasItem(itemId);
             itemViews[index].ImgNotGotVisible = !haveItem;
             itemViews[index].ShowTips = false;

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -26,6 +26,7 @@ namespace GFGGame
         private GButton _btnTuJian;
         private GButton _btnStudio;
         private GButton _btnField;
+        private GButton _btnBag;
 
 
         private GameObject _effectObj4;
@@ -102,6 +103,7 @@ namespace GFGGame
             _btnJInShu = _ui.m_list.GetChild("btnJInShu").asButton;
             _btnStudio = _ui.m_list.GetChild("btnStudio").asButton;
             _btnField = _ui.m_list.GetChild("btnField").asButton;
+            _btnBag = _ui.m_list.GetChild("btnBag").asButton;
 
             // _btnGongGao.visible = false;
             // _btnHaoYou.visible = false;
@@ -129,6 +131,7 @@ namespace GFGGame
             _btnRenWu.onClick.Add(OnClickBtnRenWu);
             _btnStudio.onClick.Add(OnClickBtnStudio);
             _btnField.onClick.Add(OnClickBtnField);
+            _btnBag.onClick.Add(OnClickBtnBag);
 
 
             AddEffect();
@@ -328,6 +331,10 @@ namespace GFGGame
 
             ViewManager.Show<FieldView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
         }
+        private void OnClickBtnBag()
+        {
+            ViewManager.Show<BagView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+        }
 
         private void OnClickBtnStore()
         {

GameClient/Assets/ResIn/UI/Bag.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 22b0f457ce0df084d9183bc8b6306fc8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/Bag/Bag_atlas0.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 587af25eac6d92e4eb75b39f96cf15ca
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/Bag/Bag_fui.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c98716728b206fa439e9f1f577be8a45
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/Bag_fui.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 458dc85c7aea4bd478924d1d3c12dc78
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: