snxxz_scripts.git

parent: f5dd6417 | 补丁 | 提交 | ignore whitespace

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

client_linchunjie

2018-09-05 762cd4013179fb66170e8c932c84ef57ad9e167c

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

6个文件已修改

	System/Compose/New/ComposeEquipWin.cs	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Compose/New/ComposeTicketWin.cs	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Compose/New/ComposeToolsWin.cs	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Compose/New/ComposeWingsWin.cs	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/MainInterfacePanel/CombatModeWin.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/SystemSetting/SettingEffectMgr.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/Compose/New/ComposeEquipWin.cs

@@ -184,7 +184,15 @@
                if (secondTypeDict.Count >= 1 && curSecondType != 0

                    && curThirdType == 1)

                {

                    cellCtrl.JumpIndex(curSecondType - 1);

                    int remain = curSecondType - firstTypeDict.Count;

                    if(remain > 0)

                    {

                        cellCtrl.JumpIndex(curSecondType- remain);

                    }

                    else

                    {

                        cellCtrl.JumpIndex(curSecondType - 1);

                    }

                }

            }

        }


 System/Compose/New/ComposeTicketWin.cs

@@ -221,7 +221,15 @@
            {

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

                {

                    cellCtrl.JumpIndex(curSecondType - 1);

                    int remain = curSecondType - firstTypeDict.Count;

                    if (remain > 0)

                    {

                        cellCtrl.JumpIndex(curSecondType - remain);

                    }

                    else

                    {

                        cellCtrl.JumpIndex(curSecondType - 1);

                    }

                }

            }

        }


 System/Compose/New/ComposeToolsWin.cs

@@ -220,7 +220,15 @@
            {

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

                {

                    cellCtrl.JumpIndex(curSecondType - 1);

                    int remain = curSecondType - firstTypeDict.Count;

                    if (remain > 0)

                    {

                        cellCtrl.JumpIndex(curSecondType - remain);

                    }

                    else

                    {

                        cellCtrl.JumpIndex(curSecondType - 1);

                    }

                }

            }

        }


 System/Compose/New/ComposeWingsWin.cs

@@ -226,7 +226,15 @@
            {

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

                {

                    cellCtrl.JumpIndex(curSecondType - 1);

                    int remain = curSecondType - firstTypeDict.Count;

                    if (remain > 0)

                    {

                        cellCtrl.JumpIndex(curSecondType - remain);

                    }

                    else

                    {

                        cellCtrl.JumpIndex(curSecondType - 1);

                    }

                }

            }

        }


 System/MainInterfacePanel/CombatModeWin.cs

@@ -52,7 +52,7 @@
            var config = Config.Instance.Get<MapConfig>(MapID);

            var activityline = 0;

            fairyGrabBossModel.TryGetFairyGrabBossLine(out activityline);

            if (activityline == PlayerDatas.Instance.baseData.FBID)//再前四章新手地图且在活动区域

            if (onMainModel.ActivityList.Contains(MapID) && activityline == PlayerDatas.Instance.baseData.FBID)//再前四章新手地图且在活动区域

            {

                AtkTypeList = new int[] { 0, 5 };

            }


 System/SystemSetting/SettingEffectMgr.cs

@@ -81,6 +81,11 @@
    float halfSecondTimer = 0;

    private void LateUpdate()

    {

        if (!(StageManager.Instance.CurrentStage is DungeonStage))

        {

            return;

        }



        secondTimer += Time.deltaTime;

        halfSecondTimer += Time.deltaTime;

        if(halfSecondTimer >= 0.5f)

			@@ -184,7 +184,15 @@
			if (secondTypeDict.Count >= 1 && curSecondType != 0
			&& curThirdType == 1)
			{
			cellCtrl.JumpIndex(curSecondType - 1);
			int remain = curSecondType - firstTypeDict.Count;
			if(remain > 0)
			{
			cellCtrl.JumpIndex(curSecondType- remain);
			}
			else
			{
			cellCtrl.JumpIndex(curSecondType - 1);
			}
			}
			}
			}

			@@ -221,7 +221,15 @@
			{
			if (secondTypeDict.Count >= 1 && curSecondType != 0)
			{
			cellCtrl.JumpIndex(curSecondType - 1);
			int remain = curSecondType - firstTypeDict.Count;
			if (remain > 0)
			{
			cellCtrl.JumpIndex(curSecondType - remain);
			}
			else
			{
			cellCtrl.JumpIndex(curSecondType - 1);
			}
			}
			}
			}

			@@ -220,7 +220,15 @@
			{
			if (secondTypeDict.Count >= 1 && curSecondType != 0)
			{
			cellCtrl.JumpIndex(curSecondType - 1);
			int remain = curSecondType - firstTypeDict.Count;
			if (remain > 0)
			{
			cellCtrl.JumpIndex(curSecondType - remain);
			}
			else
			{
			cellCtrl.JumpIndex(curSecondType - 1);
			}
			}
			}
			}

			@@ -226,7 +226,15 @@
			{
			if (secondTypeDict.Count >= 1 && curSecondType != 0)
			{
			cellCtrl.JumpIndex(curSecondType - 1);
			int remain = curSecondType - firstTypeDict.Count;
			if (remain > 0)
			{
			cellCtrl.JumpIndex(curSecondType - remain);
			}
			else
			{
			cellCtrl.JumpIndex(curSecondType - 1);
			}
			}
			}
			}

			@@ -52,7 +52,7 @@
			var config = Config.Instance.Get<MapConfig>(MapID);
			var activityline = 0;
			fairyGrabBossModel.TryGetFairyGrabBossLine(out activityline);
			if (activityline == PlayerDatas.Instance.baseData.FBID)//再前四章新手地图且在活动区域
			if (onMainModel.ActivityList.Contains(MapID) && activityline == PlayerDatas.Instance.baseData.FBID)//再前四章新手地图且在活动区域
			{
			AtkTypeList = new int[] { 0, 5 };
			}

			@@ -81,6 +81,11 @@
			float halfSecondTimer = 0;
			private void LateUpdate()
			{
			if (!(StageManager.Instance.CurrentStage is DungeonStage))
			{
			return;
			}

			secondTimer += Time.deltaTime;
			halfSecondTimer += Time.deltaTime;
			if(halfSecondTimer >= 0.5f)