snxxz_scripts.git

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

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

client_Wu Xijin

2019-01-24 069252d06598432811f600f58fb43990dd0fdca9

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

4个文件已修改

	System/JadeDynastyKnapSack/JadeDynastyDecomposeLineBeh.cs	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/JadeDynastyKnapSack/JadeDynastyEquipWin.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/JadeDynastyKnapSack/JadeDynastyItemBeh.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/Logic/PackModelInterface.cs	68 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/JadeDynastyKnapSack/JadeDynastyDecomposeLineBeh.cs

@@ -41,12 +41,15 @@
        {

            [SerializeField] CommonItemBaisc itemBaisc;

            [SerializeField] GameObject selectObj;

            [SerializeField] GameObject equipLvObj;

            [SerializeField] Text equipLvText;



            JadeDynastyDecomposeModel decomposeModel { get { return ModelCenter.Instance.GetModel<JadeDynastyDecomposeModel>(); } }



            public void SetDisplay(ItemModel itemModel,List<string> selectGuids)

            {

                itemBaisc.cellBtn.RemoveAllListeners();

                equipLvObj.SetActive(false);

                if (itemModel == null || selectGuids == null)

                {

                    itemBaisc.gameObject.SetActive(false);

@@ -57,6 +60,12 @@
                    itemBaisc.gameObject.SetActive(true);

                    selectObj.SetActive(selectGuids.Contains(itemModel.itemInfo.ItemGUID));

                    itemBaisc.Init(itemModel,true);

                    if(itemModel.chinItemModel.EquipPlace > 0)

                    {

                        equipLvObj.SetActive(true);

                        string equipLvSB = Language.Get(StringUtility.Contact("Num_CHS_", itemModel.chinItemModel.LV));

                        equipLvText.text = Language.Get("L1091", equipLvSB);

                    }

                    itemBaisc.cellBtn.AddListener(()=>

                    {

                        if (selectObj.activeInHierarchy)


 System/JadeDynastyKnapSack/JadeDynastyEquipWin.cs

@@ -130,8 +130,6 @@


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

        {

            if (type != PackType.rptJadeDynastyItem) return;



            switch(type)

            {

                case PackType.rptJadeDynastyItem:


 System/JadeDynastyKnapSack/JadeDynastyItemBeh.cs

@@ -37,6 +37,7 @@
                itemCell.cellBtn.RemoveAllListeners();

                itemCell.cellBtn.AddListener(()=>

                {

                    equipModel.ClearLookItemModel();

                    tipsModel.SetItemTipsModel(itemModel.packType,itemModel.itemInfo.ItemGUID,false,true);

                    tipsModel.SetJadeDynastyItemTipsBtn(tipsModel.curAttrData);

                    tipsModel.ShowUICtrl();


 System/KnapSack/Logic/PackModelInterface.cs

@@ -890,63 +890,35 @@
                    }

                }

            }

            ItemModel equipItemModel = null;

            SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptEquip);

            int putOnScore = 0;

            if (model.chinItemModel.EquipPlace != 9)

            {

                if (singlePack != null)

                {

                    equipItemModel = singlePack.GetItemModelByIndex(model.chinItemModel.EquipPlace);

                    if (equipItemModel != null)

                    {

                        putOnScore = equipItemModel.equipScore;

                    }



                    if (CheckIsBetterEquip(model.equipScore, putOnScore))

                    {

                        if (PlayerDatas.Instance.baseData.LV >= 200)

            int isFightUp = IsFightUp(model.itemId,model.equipScore);

            int equipPlace = model.chinItemModel.EquipPlace;

            if (isFightUp == 1)

            {

               switch(equipPlace)

                {

                    case 9:

                        break;

                    default:

                        if(model.packType == PackType.rptItem)

                        {

                            if (model.EquipPlace > (int)RoleEquipType.retWeapon2 && model.EquipPlace < (int)RoleEquipType.retNeck)

                            var equipItemModel = playerPack.GetItemModelByIndex(PackType.rptEquip, model.chinItemModel.EquipPlace);

                            if (PlayerDatas.Instance.baseData.LV >= 200)

                            {

                                if (equipItemModel != null && equipItemModel.chinItemModel.ItemColor > model.chinItemModel.ItemColor)

                                if (model.EquipPlace > (int)RoleEquipType.retWeapon2 && model.EquipPlace < (int)RoleEquipType.retNeck)

                                {

                                    return;

                                    if (equipItemModel != null && equipItemModel.chinItemModel.ItemColor > model.chinItemModel.ItemColor)

                                    {

                                        return;

                                    }

                                }

                            }

                        }

                        if (RefreshGetBetterEquipEvent != null)

                        {

                            RefreshGetBetterEquipEvent(model.itemInfo.ItemGUID);

                        }

                    }



                        break;

                }

            }

            else

            {

                if (singlePack != null)

                if (RefreshGetBetterEquipEvent != null)

                {

                    equipItemModel = singlePack.GetItemModelByIndex(model.chinItemModel.EquipPlace);

                    if (equipItemModel != null)

                    {

                        putOnScore = equipItemModel.equipScore;

                    }

                    bool isbetter = CheckIsBetterEquip(model.equipScore, putOnScore);

                    if (!isbetter)

                    {

                        equipItemModel = singlePack.GetItemModelByIndex(10);

                        putOnScore = equipItemModel == null ? 0 : equipItemModel.equipScore;

                        isbetter = CheckIsBetterEquip(model.equipScore, putOnScore);

                    }



                    if (isbetter)

                    {

                        if (RefreshGetBetterEquipEvent != null)

                        {

                            RefreshGetBetterEquipEvent(model.itemInfo.ItemGUID);

                        }

                    }

                    RefreshGetBetterEquipEvent(model.itemInfo.ItemGUID);

                }

            }

        }

			@@ -41,12 +41,15 @@
			{
			[SerializeField] CommonItemBaisc itemBaisc;
			[SerializeField] GameObject selectObj;
			[SerializeField] GameObject equipLvObj;
			[SerializeField] Text equipLvText;

			JadeDynastyDecomposeModel decomposeModel { get { return ModelCenter.Instance.GetModel<JadeDynastyDecomposeModel>(); } }

			public void SetDisplay(ItemModel itemModel,List<string> selectGuids)
			{
			itemBaisc.cellBtn.RemoveAllListeners();
			equipLvObj.SetActive(false);
			if (itemModel == null \|\| selectGuids == null)
			{
			itemBaisc.gameObject.SetActive(false);
			@@ -57,6 +60,12 @@
			itemBaisc.gameObject.SetActive(true);
			selectObj.SetActive(selectGuids.Contains(itemModel.itemInfo.ItemGUID));
			itemBaisc.Init(itemModel,true);
			if(itemModel.chinItemModel.EquipPlace > 0)
			{
			equipLvObj.SetActive(true);
			string equipLvSB = Language.Get(StringUtility.Contact("Num_CHS_", itemModel.chinItemModel.LV));
			equipLvText.text = Language.Get("L1091", equipLvSB);
			}
			itemBaisc.cellBtn.AddListener(()=>
			{
			if (selectObj.activeInHierarchy)

			@@ -130,8 +130,6 @@

			private void UpdateJadeDynastyItem(PackType type, int index, int id)
			{
			if (type != PackType.rptJadeDynastyItem) return;

			switch(type)
			{
			case PackType.rptJadeDynastyItem:

			@@ -37,6 +37,7 @@
			itemCell.cellBtn.RemoveAllListeners();
			itemCell.cellBtn.AddListener(()=>
			{
			equipModel.ClearLookItemModel();
			tipsModel.SetItemTipsModel(itemModel.packType,itemModel.itemInfo.ItemGUID,false,true);
			tipsModel.SetJadeDynastyItemTipsBtn(tipsModel.curAttrData);
			tipsModel.ShowUICtrl();

			@@ -890,63 +890,35 @@
			}
			}
			}
			ItemModel equipItemModel = null;
			SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptEquip);
			int putOnScore = 0;
			if (model.chinItemModel.EquipPlace != 9)
			{
			if (singlePack != null)
			{
			equipItemModel = singlePack.GetItemModelByIndex(model.chinItemModel.EquipPlace);
			if (equipItemModel != null)
			{
			putOnScore = equipItemModel.equipScore;
			}

			if (CheckIsBetterEquip(model.equipScore, putOnScore))
			{
			if (PlayerDatas.Instance.baseData.LV >= 200)
			int isFightUp = IsFightUp(model.itemId,model.equipScore);
			int equipPlace = model.chinItemModel.EquipPlace;
			if (isFightUp == 1)
			{
			switch(equipPlace)
			{
			case 9:
			break;
			default:
			if(model.packType == PackType.rptItem)
			{
			if (model.EquipPlace > (int)RoleEquipType.retWeapon2 && model.EquipPlace < (int)RoleEquipType.retNeck)
			var equipItemModel = playerPack.GetItemModelByIndex(PackType.rptEquip, model.chinItemModel.EquipPlace);
			if (PlayerDatas.Instance.baseData.LV >= 200)
			{
			if (equipItemModel != null && equipItemModel.chinItemModel.ItemColor > model.chinItemModel.ItemColor)
			if (model.EquipPlace > (int)RoleEquipType.retWeapon2 && model.EquipPlace < (int)RoleEquipType.retNeck)
			{
			return;
			if (equipItemModel != null && equipItemModel.chinItemModel.ItemColor > model.chinItemModel.ItemColor)
			{
			return;
			}
			}
			}
			}
			if (RefreshGetBetterEquipEvent != null)
			{
			RefreshGetBetterEquipEvent(model.itemInfo.ItemGUID);
			}
			}

			break;
			}
			}
			else
			{
			if (singlePack != null)
			if (RefreshGetBetterEquipEvent != null)
			{
			equipItemModel = singlePack.GetItemModelByIndex(model.chinItemModel.EquipPlace);
			if (equipItemModel != null)
			{
			putOnScore = equipItemModel.equipScore;
			}
			bool isbetter = CheckIsBetterEquip(model.equipScore, putOnScore);
			if (!isbetter)
			{
			equipItemModel = singlePack.GetItemModelByIndex(10);
			putOnScore = equipItemModel == null ? 0 : equipItemModel.equipScore;
			isbetter = CheckIsBetterEquip(model.equipScore, putOnScore);
			}

			if (isbetter)
			{
			if (RefreshGetBetterEquipEvent != null)
			{
			RefreshGetBetterEquipEvent(model.itemInfo.ItemGUID);
			}
			}
			RefreshGetBetterEquipEvent(model.itemInfo.ItemGUID);
			}
			}
			}