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

client_Hale

2018-09-13 612c590eb4e32229da909a794466cb820fbdd964

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

 System/Chat/ChatOtherVoiceCell.cs

@@ -16,6 +16,7 @@
        [SerializeField] Text playerNameText;

        [SerializeField] Image m_ChatIcon;

        [SerializeField] ImageFitterText m_Fitter;

        [SerializeField] Button m_ViewPlayer;



        ChatCenter m_ChatCenter;

        ChatCenter chatCenter

@@ -27,11 +28,16 @@
        }

        public override void Refresh(CellView cell)

        {

            m_ViewPlayer.RemoveAllListeners();

            ChatUeseData _data = chatCenter.GetChatData(ChatCtrl.Inst.presentChatType, cell.index) as ChatUeseData;

            if (_data == null)

            {

                return;

            }

            m_ViewPlayer.onClick.AddListener(() =>

            {

                ViewPlayer(_data);

            });

            m_ChatTxt.text = _data.content;

            m_Fitter.gameObject.SetActive(!string.IsNullOrEmpty(_data.content));

            m_ChatIcon.SetSprite(GeneralConfig.Instance.GetJobHeadPortrait(_data.job, 0));

@@ -59,6 +65,16 @@
                chatCenter.PlaySpeech(_chat.player, _chat.soundTick, _length);

            }

        }



        void ViewPlayer(ChatUeseData _chat)

        {

            ChatUeseData user = _chat as ChatUeseData;

            if (user.player == PlayerDatas.Instance.baseData.PlayerID)

            {

                return;

            }

            HrefAnalysis.Inst.ExcuteHrefEvent(string.Format("showplayer={0}", user.player));

        }

    }

}




 System/MainInterfacePanel/FeatureNoticeModel.cs

@@ -227,7 +227,9 @@
    {

        var inDungeon = IsDungeon();

        var IsOpenMaininterface = WindowCenter.Instance.CheckOpen<MainInterfaceWin>();

        if (NewBieCenter.Instance.inGuiding || ModelCenter.Instance.GetModel<TreasureModel>().newGotShowing || inDungeon || !IsOpenMaininterface)

        var treasureModel = ModelCenter.Instance.GetModel<TreasureModel>();

        if (NewBieCenter.Instance.inGuiding || treasureModel.newGotShowing || inDungeon || !IsOpenMaininterface

            || treasureModel.treasureStageUpShow || WindowCenter.Instance.ExitAnyFullScreenOrMaskWin())

        {

            return;

        }


 System/TaiChi/TaiChiModel.cs

@@ -23,7 +23,6 @@
    public int sumPlayNum { get; private set; }



    private Dictionary<int, DiceReward> diceRewardDict = new Dictionary<int, DiceReward>();

    public List<int> diceReweardIdlist { get; private set;}



    public override void Init()

    {

@@ -43,10 +42,10 @@
                switch (key1)

                {

                    case "exp":

                        diceReward.SetExpModel(jsonData[key][key1].ToString());

                        diceReward.SetExpModel(jsonData[key][key1].ToString(),2103);

                        break;

                    case "gold":

                        diceReward.SetGoldModel((int)jsonData[key][key1]);

                        diceReward.SetGoldModel((int)jsonData[key][key1],2100);

                        break;

                    case "item":

                        if(jsonData[key][key1].IsArray)

@@ -61,10 +60,6 @@
            } 

        }

        DailyQuestActionTimer.Instance.RefreshDailyQuestState += RefreshDailyQuestState;

        diceReweardIdlist = new List<int>();

        diceReweardIdlist.Add(2103);

        diceReweardIdlist.Add(2100);

        diceReweardIdlist.Add(2211);

    }



    public void OnBeforePlayerDataInitialize()

@@ -187,7 +182,9 @@
public class DiceReward

{

    public int taiChiNum { get; private set; }

    public int expId { get; private set; }

    public string exp { get; private set; }

    public int goldId { get; private set; }

    public int gold { get; private set; }

    public int itemID { get; private set; }

    public int itemCount { get; private set; }

@@ -197,14 +194,16 @@
        this.taiChiNum = taiChiNum;

    }



    public void SetExpModel(string exp)

    public void SetExpModel(string exp,int expId)

    {

        this.exp = exp;

        this.expId = expId;

    }



    public void SetGoldModel(int gold)

    public void SetGoldModel(int gold,int goldId)

    {

        this.gold = gold;

        this.goldId = goldId;

    }



    public void SetItemModel(int itemId, int itemCount)


 System/TaiChi/TaiChiRewardCell.cs

New file
@@ -0,0 +1,74 @@
using UnityEngine;

using UnityEngine.UI;

using TableConfig;



namespace Snxxz.UI

{

    enum TaiChiRewardType

    {

        box,

        gold,

        exp,

    }



    public class TaiChiRewardCell : MonoBehaviour

    {

        [SerializeField] Image bgImg;

        [SerializeField] Image itemIcon;

        [SerializeField] Text nameText;

        [SerializeField] Text numText;

        [SerializeField] Button button;

        [SerializeField] TaiChiRewardType rewardType;



        TaiChiModel taiChiModel{ get { return ModelCenter.Instance.GetModel<TaiChiModel>(); }}



        PackModelInterface modelInterface{get { return  ModelCenter.Instance.GetModel<PackModelInterface>(); }}



        private void OnEnable()

        {

            SetDisplayModel();

        }



        private void SetDisplayModel()

        {

            DiceReward diceReward = taiChiModel.GetDiceReward(taiChiModel.getResultNum);

            if (diceReward == null) return;



            ItemConfig itemConfig = null;

            switch (rewardType)

            {

                case TaiChiRewardType.box:

                    itemConfig = GetItemConfigById(diceReward.itemID);

                    numText.text = modelInterface.OnChangeCoinsUnit((ulong)diceReward.itemCount);

                    break;

                case TaiChiRewardType.gold:

                    itemConfig = GetItemConfigById(diceReward.goldId);

                    numText.text = modelInterface.OnChangeCoinsUnit((ulong)diceReward.gold);

                    break;

                case TaiChiRewardType.exp:

                    itemConfig = GetItemConfigById(diceReward.expId);

                    numText.text = modelInterface.OnChangeCoinsUnit((ulong)taiChiModel.GetDiceRewardExp(diceReward.exp));

                    break;

            }



            if(itemConfig != null)

            {

                nameText.text = itemConfig.ItemName;

                itemIcon.SetSprite(itemConfig.IconKey);

                bgImg.SetItemBackGround(itemConfig.ItemColor);

                button.RemoveAllListeners();

                button.AddListener(()=>

                {

                    ItemAttrData attrData = new ItemAttrData(itemConfig.ID, true);

                    ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(attrData);

                });

            }



        }



        private ItemConfig GetItemConfigById(int id)

        {

            return Config.Instance.Get<ItemConfig>(id);

        }

    }

}


 System/TaiChi/TaiChiRewardCell.cs.meta

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

 System/TaiChi/TaichiGetRewardWin.cs

@@ -11,39 +11,6 @@
        [SerializeField]

        Button sureBtn;



        [SerializeField]

        Text reward1Text;



        [SerializeField]

        Text reward2Text;



        [SerializeField]

        Text reward3Text;



        [SerializeField]

        Text name1Text;



        [SerializeField]

        Text name2Text;



        [SerializeField]

        Text name3Text;



        [SerializeField] List<Button> awardbtnlist = new List<Button>();

        [SerializeField] List<Image> awardBglist = new List<Image>();



        TaiChiModel _taiChiModel;

        TaiChiModel taiChiModel

        {

            get { return _taiChiModel ?? (_taiChiModel = ModelCenter.Instance.GetModel<TaiChiModel>()); }

        }



        PackModelInterface _modelInterface;

        PackModelInterface modelInterface

        {

            get { return _modelInterface ?? (_modelInterface = ModelCenter.Instance.GetModel<PackModelInterface>()); }

        }



        protected override void BindController()

        {



@@ -55,7 +22,7 @@


        protected override void OnPreOpen()

        {

            InitUI();

           
        }

        protected override void OnAfterOpen()

        {

@@ -68,38 +35,6 @@


        protected override void OnAfterClose()

        {



        }



        private void InitUI()

        {

            DiceReward diceReward = taiChiModel.GetDiceReward(taiChiModel.getResultNum);

            if (diceReward != null)

            {

                reward1Text.text = modelInterface.OnChangeCoinsUnit((ulong)taiChiModel.GetDiceRewardExp(diceReward.exp));

                name1Text.text = Language.Get("TaijiGetReward101");

                reward2Text.text = modelInterface.OnChangeCoinsUnit((ulong)diceReward.gold);

                name2Text.text = Language.Get("TaijiGetReward102");

                reward3Text.text = modelInterface.OnChangeCoinsUnit((ulong)diceReward.itemCount);

                if(diceReward.itemConfig != null)

                {

                    name3Text.text = diceReward.itemConfig.ItemName.ToString();

                }

            }



            for(int i = 0; i < awardbtnlist.Count; i++)

            {

                int index = i;

                int itemId = taiChiModel.diceReweardIdlist[index];

                ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(itemId);

                awardBglist[i].SetItemBackGround(itemConfig.ItemColor);

                awardbtnlist[i].RemoveAllListeners();

                awardbtnlist[i].AddListener(()=>

                {

                    ItemAttrData attrData = new ItemAttrData(itemId, true);

                    ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(attrData);

                });

            }



        }




 System/TaiChi/WytjGameWin.cs

@@ -3,6 +3,7 @@
using System.Collections.Generic;

using UnityEngine;

using UnityEngine.UI;

using TableConfig;

using Spine;



namespace Snxxz.UI

@@ -53,6 +54,7 @@
        [SerializeField] List<Image> resultImglist;

        [SerializeField] GameObject resultObj;

        [SerializeField] List<Button> awardbtnlist = new List<Button>();

        [SerializeField] List<Image> awardImagelist = new List<Image>();

        #endregion



        TaiChiModel _taiChiModel;

@@ -136,17 +138,6 @@
            {

                startBtn.interactable = true;

            }



            for (int i = 0; i < awardbtnlist.Count; i++)

            {

                int index = i;

                awardbtnlist[i].RemoveAllListeners();

                awardbtnlist[i].AddListener(() =>

                {

                    ItemAttrData attrData = new ItemAttrData(taiChiModel.diceReweardIdlist[index], true);

                    ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(attrData);

                });

            }

        }



        private void RefreshUI()

@@ -179,6 +170,34 @@
                reward1Text.text = modelInterface.OnChangeCoinsUnit((ulong)taiChiModel.GetDiceRewardExp(diceReward.exp));

                reward2Text.text = modelInterface.OnChangeCoinsUnit((ulong)diceReward.gold);

                reward3Text.text = modelInterface.OnChangeCoinsUnit((ulong)diceReward.itemCount);

              
                for (int i = 0; i < awardbtnlist.Count; i++)

                {

                    ItemConfig itemConfig = null;

                    switch (i)

                    {

                        case 0:

                            itemConfig = Config.Instance.Get<ItemConfig>(diceReward.itemID);

                            break;

                        case 1:

                            itemConfig = Config.Instance.Get<ItemConfig>(diceReward.goldId);

                            break;

                        case 2:

                            itemConfig = Config.Instance.Get<ItemConfig>(diceReward.expId);

                            break;

                    }



                    awardbtnlist[i].RemoveAllListeners();

                    if (itemConfig != null)

                    {

                        awardImagelist[i].SetSprite(itemConfig.IconKey);

                        awardbtnlist[i].AddListener(() =>

                        {

                            ItemAttrData attrData = new ItemAttrData(itemConfig.ID, true);

                            ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(attrData);

                        });

                    }

                }

            }



            if (taiChiModel.taiChiResultNum == "0")


 System/TaiChi/WytjRulesWin.cs

@@ -2,6 +2,7 @@
using System.Collections.Generic;

using UnityEngine;

using UnityEngine.UI;

using TableConfig;



namespace Snxxz.UI

{

@@ -63,33 +64,34 @@
                int j = 0;

                for(j = 0; j < rewardlist[i].transform.childCount; j++)

                {



                    Text numText = rewardlist[i].transform.GetChild(j).Find("num").GetComponent<Text>();

                    Button iconBtn = rewardlist[i].transform.GetChild(j).GetComponent<Button>();

                    Image itemIcon = rewardlist[i].transform.GetChild(j).GetComponent<Image>();

                    iconBtn.RemoveAllListeners();

                    ItemConfig itemConfig = null;

                    switch (j)

                    {

                        case 0:

                            itemConfig = Config.Instance.Get<ItemConfig>(diceReward.itemID);

                            numText.text = modelInterface.OnChangeCoinsUnit((ulong)diceReward.itemCount);

                            iconBtn.AddListener(()=>

                            {

                                ModelCenter.Instance.GetModel<GetItemPathModel>().SetChinItemModel(diceReward.itemID);

                            });

                            break;

                        case 1:

                            itemConfig = Config.Instance.Get<ItemConfig>(diceReward.goldId);

                            numText.text = modelInterface.OnChangeCoinsUnit((ulong)diceReward.gold);

                            iconBtn.AddListener(() =>

                            {

                                ModelCenter.Instance.GetModel<GetItemPathModel>().SetChinItemModel(taiChiModel.diceReweardIdlist[1]);

                            });

                            break;

                        case 2:

                            itemConfig = Config.Instance.Get<ItemConfig>(diceReward.expId);

                            numText.text = modelInterface.OnChangeCoinsUnit((ulong)taiChiModel.GetDiceRewardExp(diceReward.exp));

                            break;

                    }



                    if(itemConfig != null)

                    {

                        itemIcon.SetSprite(itemConfig.IconKey);

                            iconBtn.AddListener(() =>

                            {

                                ModelCenter.Instance.GetModel<GetItemPathModel>().SetChinItemModel(taiChiModel.diceReweardIdlist[0]);

                            ModelCenter.Instance.GetModel<GetItemPathModel>().SetChinItemModel(itemConfig.ID);

                            });

                            break;

                    }

                }

            }


 System/Treasure/TreasureLevelUpWin.cs

@@ -1007,9 +1007,10 @@
            CameraUtility.ScreenShotCut((Texture2D _tex) =>

            {

                TreasureStageUpTriggerWin.screenShotCut = _tex;

                WindowJumpMgr.Instance.ClearJumpData();

                WindowCenter.Instance.Open<MainInterfaceWin>();

                CloseImmediately();

                WindowCenter.Instance.Open<TreasureStageUpTriggerWin>(true);

                WindowCenter.Instance.Open<MainInterfaceWin>();

                if (WindowCenter.Instance.CheckOpen<DialogueDuidanceWin>())

                {

                    WindowCenter.Instance.CloseImmediately<DialogueDuidanceWin>();