少年修仙传客户端代码仓库
client_Wu Xijin
2018-09-10 4bb06ac485159a203d59dc054467095f95980dbc
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
4个文件已修改
55 ■■■■ 已修改文件
System/Dogz/DogzModel.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Dogz/DogzWin.cs 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/FairyAu/WarehouseTipsWin.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/ItemTipsModel.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Dogz/DogzModel.cs
@@ -155,6 +155,15 @@
            }
        }
        public event Action<int> OpenFuncEvent;
        public void OpenDogzFuncEvent(int functionOrder)
        {
            if(OpenFuncEvent != null)
            {
                OpenFuncEvent(functionOrder);
            }
        }
        #region 协议
        public int addAssistCnt { get; private set; } //额外购买的助战数
System/Dogz/DogzWin.cs
@@ -39,22 +39,9 @@
            });
        }
        private void OnDogzStrengthen()
        {
            CloseChild();
            functionOrder = 1;
            WindowCenter.Instance.Open<GodBeastReinforcementWin>();
        }
        private void OnDogz()
        {
            CloseChild();
            functionOrder = 0;
            WindowCenter.Instance.Open<DogzActiveWin>();
        }
        protected override void OnPreOpen()
        {
            dogzModel.OpenFuncEvent += OnOpenFuncEvent;
            dogzModel.SetDefaultSelectDogz();
        }
@@ -71,6 +58,7 @@
        protected override void OnPreClose()
        {
            dogzModel.OpenFuncEvent -= OnOpenFuncEvent;
        }
        protected override void OnAfterClose()
@@ -81,6 +69,26 @@
            }
        }
        private void OnOpenFuncEvent(int order)
        {
            funcBtnGroup.TriggerByOrder(order);
        }
        private void OnDogzStrengthen()
        {
            CloseChild();
            functionOrder = 1;
            WindowCenter.Instance.Open<GodBeastReinforcementWin>();
        }
        private void OnDogz()
        {
            CloseChild();
            functionOrder = 0;
            WindowCenter.Instance.Open<DogzActiveWin>();
        }
        void OnClose()
        {
            CloseChild();
System/FairyAu/WarehouseTipsWin.cs
@@ -76,6 +76,8 @@
        [SerializeField] GameObject _Dropdown;//装备颜色
        [SerializeField] GameObject _WarehouseCountBG;//仓库积分面板
        [SerializeField] int _FamilyPosition = 0;//家族职位
        [SerializeField] Button m_BtnAdd;//获取途径按钮
        private AchievementGuideEffect AchievementGuideEffect1;
        int Item_lv = 0;//标记物品阶数
        int Item_Color = 0;//标记物品颜色
@@ -85,6 +87,8 @@
        int _WPID = 0;//用来标记需要兑换的物品ID
        private int SpiritPetDan = 0;
        public static event Action RedPointUpdate;
        GetItemPathModel _GetItemPath;
        GetItemPathModel GetItemPath { get { return _GetItemPath ?? (_GetItemPath = ModelCenter.Instance.GetModel<GetItemPathModel>()); } }
        #endregion
@@ -100,6 +104,10 @@
        protected override void AddListeners()
        {
            AddListen();
            m_BtnAdd.AddListener(()=>
            {
                GetItemPath.SetChinItemModel(2150);
            });
        }
        protected override void OnPreOpen()
System/KnapSack/Logic/ItemTipsModel.cs
@@ -743,7 +743,7 @@
            });
            attrData.SetTipsFuncBtn(ItemWinBtnType.strength, (ItemWinBtnType, ItemAttrData) => {
                WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.StrengthFunc1);
                dogzModel.OpenDogzFuncEvent(1);
            });
        }