Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-11-01 4f4041307599b0bcf52abe72bc2c80cbd0c143a1

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 Core/GameEngine/Model/Config/NPCConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------

//    [Author]:            第二世界

//    [  Date ]:           Monday, August 20, 2018

//    [  Date ]:           Thursday, November 01, 2018

//--------------------------------------------------------



using UnityEngine;

@@ -69,6 +69,7 @@
        public int NPCEffect { get ; private set ; }

        public int NPCSpeakID { get ; private set ; }

        public int ClientRealm { get ; private set ; }

        public string Equips { get ; private set; } 


        public override string getKey()

        {

@@ -198,6 +199,8 @@
                NPCSpeakID=IsNumeric(rawContents[56]) ? int.Parse(rawContents[56]):0; 

            

                ClientRealm=IsNumeric(rawContents[57]) ? int.Parse(rawContents[57]):0; 

			
                Equips = rawContents[58].Trim();

            }

            catch (Exception ex)

            {


 System/Dogz/DogzModel.cs

@@ -961,8 +961,12 @@
            }

        }



        public event Action UpdateDogzPutRedEvent;

        public int dogzPutRedId { get;set; }



        public void UpdateDogzEquipPlaceRed()

        {

            dogzPutRedId = 0;

            if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Dogz)) return;



            foreach (var value in dogzEquipPlaceRedDict.Values)

@@ -1027,6 +1031,7 @@
                                Redpoint equipPlaceRedpoint = GetDogzEquipPlaceRedpointById(spaceDogzId,i);

                                if(equipPlaceRedpoint.state == RedPointState.None)

                                {

                                    dogzPutRedId = spaceDogzId;

                                    equipPlaceRedpoint.state = RedPointState.Simple;

                                }

                                break;

@@ -1076,6 +1081,7 @@
                                Redpoint equipPlaceRedpoint = GetDogzEquipPlaceRedpointById(dogzId, i);

                                if (equipPlaceRedpoint.state == RedPointState.None)

                                {

                                    dogzPutRedId = dogzId;

                                    equipPlaceRedpoint.state = RedPointState.Simple;

                                    break;

                                }

@@ -1085,6 +1091,11 @@
                    }

                }

            }



            if(UpdateDogzPutRedEvent != null)

            {

                UpdateDogzPutRedEvent();

            }

        }



        public List<int> GetDogzIdByOrder()


 System/KnapSack/DogzNotifyBehaviour.cs

New file
@@ -0,0 +1,54 @@
using System;

using UnityEngine;

using UnityEngine.UI;

using TableConfig;



namespace Snxxz.UI

{

    public class DogzNotifyBehaviour : MonoBehaviour

    {

        [SerializeField] Text titleText;

        [SerializeField] Image dogzImg;

        [SerializeField] Button gotoBtn;

        [SerializeField] Button closeBtn;

        DogzModel dogzModel { get { return ModelCenter.Instance.GetModel<DogzModel>(); } }



        private void OnEnable()

        {

            closeBtn.AddListener(CloseNotify);

            gotoBtn.AddListener(ClickGoto);

        }



        private void OnDisable()

        {

            closeBtn.RemoveAllListeners();

            gotoBtn.RemoveAllListeners();

        }



        public void SetDisplay()

        {

            DogzConfig dogzConfig = Config.Instance.Get<DogzConfig>(dogzModel.dogzPutRedId);

            if(dogzConfig == null)

            {

                CloseNotify();

            }

            else

            {

                this.gameObject.SetActive(true);

                dogzImg.SetSprite(dogzConfig.HeadIcon);

            }

        }



        private void ClickGoto()

        {

            WindowCenter.Instance.Open<DogzWin>();

            CloseNotify();

        }



        public void CloseNotify()

        {

            dogzModel.dogzPutRedId = 0;

            this.gameObject.SetActive(false);

        }

    }

}


 System/KnapSack/DogzNotifyBehaviour.cs.meta

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 02dfbf58d32aa544aa139b28100aa5d2
timeCreated: 1541055844
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 System/MainInterfacePanel/InGamePushContainer.cs

@@ -25,6 +25,7 @@
        [SerializeField] DungeonGuardCheckBehaviour m_DungeonGuardBehaviour;

        [SerializeField] FirstChargeTrialBehaviour m_FirstChargeTrialBehaviour;

        [SerializeField] FairyGrabBossHelpBehaviour m_FairyGrabBossHelpBehaviour;

        [SerializeField] DogzNotifyBehaviour m_DogzNotifyBehaviour;



        WorldBossModel worldBossModel { get { return ModelCenter.Instance.GetModel<WorldBossModel>(); } }

        BossHomeModel bossHomeModel { get { return ModelCenter.Instance.GetModel<BossHomeModel>(); } }

@@ -46,6 +47,8 @@
        GuardModel guardModel { get { return ModelCenter.Instance.GetModel<GuardModel>(); } }

        FirstTimeRechargeModel firstTimeRechargeModel { get { return ModelCenter.Instance.GetModel<FirstTimeRechargeModel>(); } }

        FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }

        DogzModel dogzModel { get { return ModelCenter.Instance.GetModel<DogzModel>(); } }



        public void Init()

        {

            CheckBetterEquip();

@@ -60,6 +63,7 @@
            CheckDungeonGuard();

            FirstChargeTrialShow();

            CheckFairyGrabBossHelp();

            CheckDogzNotify();

            playerPack.RefreshDecomAttrAct += CheckEquipDecompose;

            betterEquipGetModel.showEquipRefreshEvent += CheckBetterEquip;

            realmEquipModel.showEquipRefreshEvent += CheckRealmBetterEquip;

@@ -71,6 +75,7 @@
            guardModel.onDungeonEquipGuardEvent += CheckDungeonGuard;

            firstTimeRechargeModel.IsTipShowEvent += FirstChargeTrialShow;

            fairyGrabBossModel.fairyGrabBossHelpUpdate += CheckFairyGrabBossHelp;

            dogzModel.UpdateDogzPutRedEvent += CheckDogzNotify;

        }



        public void UnInit()

@@ -86,6 +91,7 @@
            firstTimeRechargeModel.IsTipShowEvent -= FirstChargeTrialShow;

            realmEquipModel.showEquipRefreshEvent -= CheckRealmBetterEquip;

            fairyGrabBossModel.fairyGrabBossHelpUpdate -= CheckFairyGrabBossHelp;

            dogzModel.UpdateDogzPutRedEvent -= CheckDogzNotify;

        }



        private void CheckRealmBetterEquip()

@@ -128,6 +134,11 @@
            }

        }



        private void CheckDogzNotify()

        {

            m_DogzNotifyBehaviour.SetDisplay();

        }



        private void CheckPreciousItem()

        {

            if (preciousItemGetModel.currentShowItem == default(PreciousItemGetModel.PreciousItem))


 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -907,7 +907,8 @@
                        _ExpSlider.delay = _Delaytime;

                    }

                    ExpValueFloat = ((float)nowVlaue / (float)maxValue);

                    if (ExpValueFloat != _ExpSlider.value)

                    int MapID = PlayerDatas.Instance.baseData.MapID;

                    if (ExpValueFloat != _ExpSlider.value && MapID== 31080)

                    {

                        m_UIEffect_A.Play();

                        if (m_UIEffect_A.IsPlaying)