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

client_Zxw

2018-08-28 8a9a5aa087eb474c3877ec3a837f56dacec27cc6

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

 Hooks.meta

New file
@@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 9d61790025bb37c40bddf94ec0af03c0
folderAsset: yes
timeCreated: 1535439805
licenseType: Pro
DefaultImporter:
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Hooks/commit-msg

New file
@@ -0,0 +1,12 @@
#!/bin/sh
# -*- coding: UTF-8 -*- 

if [ "$(grep -in '^[0-9]*[1-9][0-9]* .*' "$1")" == "" ] && [ "$(grep -in '^Merge .*' "$1")" == "" ] && [ "$(grep -in '^Revert .*' "$1")" == "" ]; then
    echo 以下3种是正确的备注信息是：
    echo 1. 12345 正常提交备注信息必须以数字单号开头。#数字单号后面带空格#
    echo 2. Merge 以Merge开头说明这是一次git合并操作，这是被允许的。#Merge后面带空格#
    echo 3. Revert 以Revert开头说明这是一次git还原操作，这是被允许的。#Revert后面带空格#
    exit 1

fi


 Hooks/commit-msg.meta

New file
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 6e206316701753040b92da0fc46edbe8
timeCreated: 1535439812
licenseType: Pro
DefaultImporter:
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 System/BlastFurnace/LingDanTips.cs

@@ -254,6 +254,15 @@
        {

            CreateCell();

            OnClickDandrugCell(presentIndex);

            if(chooseSpecModel != null)

            {

                int haveCnt = playerPack.GetItemCountByID(PackType.rptItem,chooseSpecModel.SpecialMaterialD);

                if(haveCnt <= 0)

                {

                    SetSpecMatItemCell(null);

                    CreateRandomLineCell();

                }

            }

        }



        private void RefreshDandrugCell(ScrollerDataType type, CellView cell)


 System/HappyXB/BestXBWin.cs

@@ -34,7 +34,8 @@
        [SerializeField] Image toolImg1;

        [SerializeField] Image toolImg2;

        [SerializeField] Text toolNumText;



        [SerializeField] Button skipBtn;

        [SerializeField] GameObject skipImg;

        [Header("控制寻宝转动圈数")]

        [SerializeField] int cycleTimes = 1;

        [Header("时间间隔")]

@@ -93,6 +94,7 @@
            xbBtn.AddListener(ClickXBBtn);

            xbManyBtn.AddListener(ClickXBManyBtn);

            freeXbBtn.AddListener(ClickFreeXbBtn);

            skipBtn.AddListener(ClickSkipBtn);

        }

        protected override void OnPreOpen()

        {

@@ -201,6 +203,7 @@


            RefreshXBTypeInfo();

            RefreshXBTools();

            RefreshSkipUI();

        }



        private void RefreshFreeTime(float time)

@@ -228,6 +231,16 @@
         

        }



        private void RefreshSkipUI()

        {

            skipImg.SetActive(XBModel.isJumpBestXB);

        }



        private void ClickSkipBtn()

        {

            XBModel.isJumpBestXB = !XBModel.isJumpBestXB;

            RefreshSkipUI();

        }



        private void RefreshItemCount(PackType type, int index, int id)

        {

@@ -294,10 +307,18 @@


        private void RefreshXBResult()

        {

            if(XBModel.isJumpBestXB)

            {

                ResetXBItemState();

                WindowCenter.Instance.Open<HappyXBGetItemWin>();

            }

            else

            {

            CreateGetItem();

            targetIndexs = XBModel.rangelist;

            StartCoroutine(PlayXBAni(0,0));

        }

        }



        private void CreateGetItem()

        {


 System/HappyXB/HappyXBModel.cs

@@ -28,8 +28,13 @@
        public List<ArrayList> XBNotifyParms = new List<ArrayList>();

        public bool isXBCoolTime { get; set; }



        public bool isJumpBestXB { get; set;}

        public bool isJumpRuneXB { get; set; }



        public override void Init()

        {

            isJumpBestXB = false;

            isJumpRuneXB = false;

            xbGetItemDict.Clear();

            xbTypeItemDict.Clear();

            xbFuncSetDict.Clear();


 System/HappyXB/RuneXBWin.cs

@@ -35,7 +35,8 @@
        [SerializeField] Text toolNumText;

        [SerializeField] Image toolImg1;

        [SerializeField] Image toolImg2;



        [SerializeField] Button skipBtn;

        [SerializeField] GameObject skipImg;

        [Header("控制寻宝转动圈数")]

        [SerializeField] int cycleTimes = 1;

        [Header("时间间隔")]

@@ -95,6 +96,7 @@
            xbManyBtn.AddListener(ClickXBManyBtn);

            freeXbBtn.AddListener(ClickFreeXbBtn);

            lookRuneBtn.AddListener(ClickLookRuneBtn);

            skipBtn.AddListener(ClickSkipBtn);

        }



        private void ClickLookRuneBtn()

@@ -211,6 +213,7 @@


            RefreshXBTypeInfo();

            RefreshXBTools();

            RefreshSkipUI();

        }



        private void RefreshFreeTime(float time)

@@ -236,6 +239,17 @@
                freeXBTimeText.gameObject.SetActive(false);

            }

         

        }



        private void RefreshSkipUI()

        {

            skipImg.SetActive(XBModel.isJumpRuneXB);

        }



        private void ClickSkipBtn()

        {

            XBModel.isJumpRuneXB = !XBModel.isJumpRuneXB;

            RefreshSkipUI();

        }



        private void RefreshItemCount(PackType type, int index, int id)

@@ -309,10 +323,18 @@


        private void RefreshXBResult()

        {

            if (XBModel.isJumpRuneXB)

            {

                ResetXBItemState();

                WindowCenter.Instance.Open<HappyXBGetItemWin>();

            }

            else

            {

            CreateGetItem();

            targetIndexs = XBModel.rangelist;

            StartCoroutine(PlayXBAni(0,0));

        }

        }



        private void CreateGetItem()

        {