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

client_Wu Xijin

2018-09-21 e1227f4d5faf3f52bb6ab3fef832cac68c3e29ec

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

 Core/GameEngine/Model/Config/WHYJRewardConfig.cs

New file
@@ -0,0 +1,44 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Friday, September 21, 2018
//--------------------------------------------------------

using UnityEngine;
using System;

namespace TableConfig {

    
    public partial class WHYJRewardConfig : ConfigBase {

        public int ID { get ; private set ; }

        public string Reward { get ; private set; } 
        public string Quantity { get ; private set; } 

        public override string getKey()
        {
            return ID.ToString();
        }

        public override void Parse() {
            try
            {
                ID=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0; 
			
                Reward = rawContents[1].Trim();

			
                Quantity = rawContents[2].Trim();
            }
            catch (Exception ex)
            {
                DebugEx.Log(ex);
            }
        }
	
    }

}





 Core/GameEngine/Model/Config/WHYJRewardConfig.cs.meta

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 00dab7d472dcc5644902b144de22ce01
timeCreated: 1537529264
licenseType: Free
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Core/GameEngine/Model/ConfigManager.cs

@@ -191,7 +191,7 @@
        AddAsyncTask<FairyGrabBossConfig>();

        AddAsyncTask<DungeonSpecialStateTimeConfig>();

        AddAsyncTask<DailyQuestSpecialOpenTimeConfig>();



        AddAsyncTask<WHYJRewardConfig>();

        while (!AllCompleted())

        {

            var completedCount = 0;


 System/Dogz/DogzPackWin.cs

@@ -178,6 +178,7 @@
        private void GetEquipBtn()

        {

            //--界面跳转

            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.DogzDungeon);

        }



        private void ClickStarSelect()


 System/Dungeon/DungenWHYJ.cs

New file
@@ -0,0 +1,99 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [  Date ]:           Friday, September 21, 2018
//--------------------------------------------------------
using UnityEngine;
using System.Collections;
using UnityEngine.UI;
using TableConfig;
using System;



namespace Snxxz.UI

{

    public class DungenWHYJ : MonoBehaviour

    {

        [SerializeField] Button m_WHYJButton;

        [SerializeField] GameObject m_Container_WHYJ;

        [SerializeField] Transform m_Horizontal;

        DungeonModel model { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }



        public void Init()

        {

            model.dungeonFightStageChangeEevent -= dungeonFightStageChangeEevent;

            model.dungeonFightStageChangeEevent += dungeonFightStageChangeEevent;

            if (model.dungeonFightStage == DungeonFightStage.Prepare)

            {

                m_Container_WHYJ.SetActive(true);

            }

            else

            {

                m_Container_WHYJ.SetActive(false);

            }

            SetTranItemCell();

        }

        private void Start()

        {

            m_WHYJButton.AddListener(OnClickButton);

        }
        private void OnEnable()

        {

           
        }
        private void OnDisable()

        {

           
        }



        private void dungeonFightStageChangeEevent(DungeonFightStage obj)

        {

            if (obj == DungeonFightStage.Prepare)

            {

                if (!m_Container_WHYJ.activeSelf)

                {

                    m_Container_WHYJ.SetActive(true);

                }

            }

            else if(obj == DungeonFightStage.Normal)

            {

                if (m_Container_WHYJ.activeSelf)

                {

                    m_Container_WHYJ.SetActive(false);

                }

            }

        }



        private void SetTranItemCell()

        {

            int lineID = model.mission.lineID;

            var WHYJConfig = Config.Instance.Get<WHYJRewardConfig>(lineID+1);

            int[] RewardList = ConfigParse.GetMultipleStr<int>(WHYJConfig.Reward);

            int[] QuantityList = ConfigParse.GetMultipleStr<int>(WHYJConfig.Quantity);

            for (int i = 0; i < m_Horizontal.childCount; i++)

            {

                if (i < RewardList.Length)

                {

                    m_Horizontal.GetChild(i).gameObject.SetActive(true);

                    ItemCell ItemCell = m_Horizontal.GetChild(i).GetComponent<ItemCell>();

                    ItemCellModel cellModel = new ItemCellModel(RewardList[i], true, (ulong)QuantityList[i], 0);

                    ItemCell.Init(cellModel);

                }

                else

                {

                    m_Horizontal.GetChild(i).gameObject.SetActive(false);

                }



            }



        }
        private void OnClickButton()

        {

            m_Container_WHYJ.SetActive(!m_Container_WHYJ.activeSelf);

        }
    }

}




 System/Dungeon/DungenWHYJ.cs.meta

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 979d7cffed796d145bb0cc4290a14943
timeCreated: 1537527871
licenseType: Free
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 System/Dungeon/DungeonFightWin.cs

@@ -30,7 +30,8 @@
        [SerializeField] DungeonItemCollect m_ItemCollect;

        [SerializeField] DungeonGuardSkyBehaviour m_GuardSky;

        [SerializeField] DungeonBossBriefInfoContainer m_BossInfosContainer;



        [SerializeField] GameObject m_Container_WHYJ;

        [SerializeField] DungenWHYJ m_DungenWHYJ;

        bool excutedAutoExit = false;

        float timer = 0f;

        DateTime endTime = DateTime.Now;

@@ -97,6 +98,15 @@


            model.dungeonCoolDownEvent += OnLeaveMapTimeEvent;

            MainInterfaceWin.Event_Duplicates += OnChangeFuncBtnPosEvent;

            if (WHYJBool())

            {

                m_Container_WHYJ.SetActive(true);

                m_DungenWHYJ.Init();

            }

            else

            {

                m_Container_WHYJ.SetActive(false);

            }

        }



        protected override void OnAfterOpen()

@@ -365,6 +375,18 @@


        }



        private bool  WHYJBool()//判断是否在娲皇遗迹副本

        {

            var dataMapId = model.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);

            if (dataMapId == GeneralConfig.Instance.ruinsTranscriptMapId)

            {

                return true;

            }

            else

            {

                return false;

            }      
        }

    }



}


 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -716,7 +716,7 @@
        void DownButton(GameObject go)

        {

            _ExpRate.gameObject.SetActive(true);



          //  WindowCenter.Instance.Open<WheelOfFortuneWin>();

        }

        void UpButton(GameObject go)

        {


 System/WindowJump/WindowJumpMgr.cs

@@ -558,6 +558,7 @@
                SetJumpLogic<FindPreciousFrameWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.LootPreciousFrameFunc1:

            case JumpUIType.DogzDungeon:

                SetJumpLogic<LootPreciousFrameWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.LootPreciousFrameSpec:

@@ -1180,6 +1181,7 @@
    WelfareFunc1 = 102, //签到

    WelfareFunc2 = 103,  //祈愿

    LootPreciousFrameFunc1 = 104, //封魔坛

    DogzDungeon = 242, //异兽之地

    SystemSettingFunc1 = 109,//挂机设置



    RebornOpenBag = 113,//死亡复活打开背包