snxxz_scripts.git

parent: 93ab6fe5 | 补丁 | 提交 | ignore whitespace

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

client_Wu Xijin

2018-10-26 bfae745a714d24d63846bb823e589a4146857f32

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

5个文件已修改

	System/Compose/New/ComposeDogzEquipWin.cs	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Compose/New/ComposeEquipWin.cs	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Compose/New/ComposeTicketWin.cs	25 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Compose/New/ComposeToolsWin.cs	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Compose/New/ComposeWingsWin.cs	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/Compose/New/ComposeDogzEquipWin.cs

@@ -1,6 +1,7 @@
using Snxxz.UI;

using System;

using System.Collections.Generic;

using System.Linq;

using TableConfig;

using UnityEngine;

using UnityEngine.UI;

@@ -172,13 +173,28 @@
            if (secondTypeDict != null)

            {

                if (secondTypeDict.Count >= 1 && curSecondType != 0

                    && curThirdType == 1)

                    && curThirdType >= 1)

                {

                    cellCtrl.JumpIndex(curSecondType - 1);

                    cellCtrl.JumpIndex(GetCurIndex(curSecondType));

                }

            }

        }



        private int GetCurIndex(int secondType)

        {

            int curIndex = 0;

            List<int> secondlist = firstTypeDict.Keys.ToList();

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

            {

                if (secondType == secondlist[i])

                {

                    curIndex = i;

                    break;

                }

            }

            return curIndex;

        }



        private void RefreshCell(ScrollerDataType type, CellView cell)

        {

            Image icon = cell.transform.Find("BtnIcon").GetComponent<Image>();


 System/Compose/New/ComposeEquipWin.cs

@@ -1,6 +1,7 @@
using Snxxz.UI;

using System;

using System.Collections.Generic;

using System.Linq;

using TableConfig;

using UnityEngine;

using UnityEngine.UI;

@@ -210,19 +211,26 @@
                if (secondTypeDict.Count >= 1 && curSecondType != 0

                    && curThirdType >= 1)

                {

                    int remain = curSecondType - firstTypeDict.Count;

                    if(remain > 0)

                    {

                        cellCtrl.JumpIndex(curSecondType- remain);

                    }

                    else

                    {

                        cellCtrl.JumpIndex(curSecondType - 1);

                    }

                    cellCtrl.JumpIndex(GetCurIndex(curSecondType));

                }

            }

        }



        private int GetCurIndex(int secondType)

        {

            int curIndex = 0;

            List<int> secondlist = firstTypeDict.Keys.ToList();

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

            {

                if(secondType == secondlist[i])

                {

                    curIndex = i;

                    break;

                }

            }

            return curIndex;

        }



        private void RefreshCell(ScrollerDataType type, CellView cell)

        {

            Image icon = cell.transform.Find("BtnIcon").GetComponent<Image>();


 System/Compose/New/ComposeTicketWin.cs

@@ -1,6 +1,7 @@
using Snxxz.UI;

using System;

using System.Collections.Generic;

using System.Linq;

using TableConfig;

using UnityEngine;

using UnityEngine.UI;

@@ -221,19 +222,25 @@
            {

                if (secondTypeDict.Count >= 1 && curSecondType != 0)

                {

                    int remain = curSecondType - firstTypeDict.Count;

                    if (remain > 0)

                    {

                        cellCtrl.JumpIndex(curSecondType - remain);

                    }

                    else

                    {

                        cellCtrl.JumpIndex(curSecondType - 1);

                    }

                    cellCtrl.JumpIndex(GetCurIndex(curSecondType));

                }

            }

        }



        private int GetCurIndex(int secondType)

        {

            int curIndex = 0;

            List<int> secondlist = firstTypeDict.Keys.ToList();

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

            {

                if (secondType == secondlist[i])

                {

                    curIndex = i;

                    break;

                }

            }

            return curIndex;

        }

        private void RefreshCell(ScrollerDataType type, CellView cell)

        {

            Image icon = cell.transform.Find("BtnIcon").GetComponent<Image>();


 System/Compose/New/ComposeToolsWin.cs

@@ -2,6 +2,7 @@
using System;

using System.Collections;

using System.Collections.Generic;

using System.Linq;

using TableConfig;

using UnityEngine;

using UnityEngine.UI;

@@ -220,19 +221,26 @@
            {

                if (secondTypeDict.Count >= 1 && curSecondType != 0)

                {

                    int remain = curSecondType - firstTypeDict.Count;

                    if (remain > 0)

                    {

                        cellCtrl.JumpIndex(curSecondType - remain);

                    }

                    else

                    {

                        cellCtrl.JumpIndex(curSecondType - 1);

                    }

                    cellCtrl.JumpIndex(GetCurIndex(curSecondType));

                }

            }

        }



        private int GetCurIndex(int secondType)

        {

            int curIndex = 0;

            List<int> secondlist = firstTypeDict.Keys.ToList();

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

            {

                if (secondType == secondlist[i])

                {

                    curIndex = i;

                    break;

                }

            }

            return curIndex;

        }



        private IEnumerator SetOffestPos()

        {

            yield return null;


 System/Compose/New/ComposeWingsWin.cs

@@ -1,6 +1,7 @@
using Snxxz.UI;

using System;

using System.Collections.Generic;

using System.Linq;

using TableConfig;

using UnityEngine;

using UnityEngine.UI;

@@ -226,19 +227,26 @@
            {

                if (secondTypeDict.Count >= 1 && curSecondType != 0)

                {

                    int remain = curSecondType - firstTypeDict.Count;

                    if (remain > 0)

                    {

                        cellCtrl.JumpIndex(curSecondType - remain);

                    }

                    else

                    {

                        cellCtrl.JumpIndex(curSecondType - 1);

                    }

                    cellCtrl.JumpIndex(GetCurIndex(curSecondType));

                }

            }

        }



        private int GetCurIndex(int secondType)

        {

            int curIndex = 0;

            List<int> secondlist = firstTypeDict.Keys.ToList();

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

            {

                if (secondType == secondlist[i])

                {

                    curIndex = i;

                    break;

                }

            }

            return curIndex;

        }



        private void RefreshCell(ScrollerDataType type, CellView cell)

        {

            Image icon = cell.transform.Find("BtnIcon").GetComponent<Image>();

			@@ -1,6 +1,7 @@
			using Snxxz.UI;
			using System;
			using System.Collections.Generic;
			using System.Linq;
			using TableConfig;
			using UnityEngine;
			using UnityEngine.UI;
			@@ -172,13 +173,28 @@
			if (secondTypeDict != null)
			{
			if (secondTypeDict.Count >= 1 && curSecondType != 0
			&& curThirdType == 1)
			&& curThirdType >= 1)
			{
			cellCtrl.JumpIndex(curSecondType - 1);
			cellCtrl.JumpIndex(GetCurIndex(curSecondType));
			}
			}
			}

			private int GetCurIndex(int secondType)
			{
			int curIndex = 0;
			List<int> secondlist = firstTypeDict.Keys.ToList();
			for (int i = 0; i < secondlist.Count; i++)
			{
			if (secondType == secondlist[i])
			{
			curIndex = i;
			break;
			}
			}
			return curIndex;
			}

			private void RefreshCell(ScrollerDataType type, CellView cell)
			{
			Image icon = cell.transform.Find("BtnIcon").GetComponent<Image>();

			@@ -2,6 +2,7 @@
			using System;
			using System.Collections;
			using System.Collections.Generic;
			using System.Linq;
			using TableConfig;
			using UnityEngine;
			using UnityEngine.UI;
			@@ -220,19 +221,26 @@
			{
			if (secondTypeDict.Count >= 1 && curSecondType != 0)
			{
			int remain = curSecondType - firstTypeDict.Count;
			if (remain > 0)
			{
			cellCtrl.JumpIndex(curSecondType - remain);
			}
			else
			{
			cellCtrl.JumpIndex(curSecondType - 1);
			}
			cellCtrl.JumpIndex(GetCurIndex(curSecondType));
			}
			}
			}

			private int GetCurIndex(int secondType)
			{
			int curIndex = 0;
			List<int> secondlist = firstTypeDict.Keys.ToList();
			for (int i = 0; i < secondlist.Count; i++)
			{
			if (secondType == secondlist[i])
			{
			curIndex = i;
			break;
			}
			}
			return curIndex;
			}

			private IEnumerator SetOffestPos()
			{
			yield return null;