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

client_linchunjie

2018-08-27 4c0d9dcb998c6645dbb30be778e9d6f93458ac03

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

 Core/GameEngine/Model/Config/GetItemWaysConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Wednesday, June 06, 2018
//    [  Date ]:           Monday, August 27, 2018

//--------------------------------------------------------

using UnityEngine;
@@ -18,6 +18,7 @@
        public string SelectActive { get ; private set; } 

        public int OpenpanelId { get ; private set ; }

        public int FuncOpenId { get ; private set ; }

        public int ActiveType { get ; private set ; }


        public override string getKey()

        {

@@ -40,6 +41,8 @@
                OpenpanelId=IsNumeric(rawContents[5]) ? int.Parse(rawContents[5]):0; 

            

                FuncOpenId=IsNumeric(rawContents[6]) ? int.Parse(rawContents[6]):0; 

			
                ActiveType=IsNumeric(rawContents[7]) ? int.Parse(rawContents[7]):0; 
            }

            catch (Exception ex)

            {


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

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 1a2d1561c3b3d9d40b6ff80cbeb37298
timeCreated: 1528265994
timeCreated: 1535360341
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Fight/PreFightMission.cs

@@ -917,6 +917,8 @@
    private IEnumerator LookNpcBorn()

    {

        GA_Hero.s_MapSwitching = true;





        // 摄像机移动至石头人出现区域

        CameraController.Instance.SetLookTarget(null);

        CameraController.Instance.transform.position = PlayerDatas.Instance.hero.Pos;

@@ -940,12 +942,14 @@
        // 回到玩家身上

        CameraController.Instance.SetLookTarget(PlayerDatas.Instance.hero.Root);



        yield return WaitingForSecondConst.WaitMS500;



        // 显示任务界面

        Transform _temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/TaskAndTeamTip/TaskListTip");

        _temp.gameObject.SetActive(true);



        WindowCenter.Instance.Get<MainInterfaceWin>().ForceShowTaskPanel();



        yield return WaitingForSecondConst.WaitMS500;



        // 打开引导界面

        NewGuideModel _model2 = ModelCenter.Instance.GetModel<NewGuideModel>();

        _model2.showMask = true;


 System/MainInterfacePanel/FlyingShoesTask.cs

@@ -121,7 +121,7 @@


            taskmodel.GetNowTaskID = Task_ID;



            if (mainModel.TaskId_Skill1.Contains(Task_ID))

            if (mainModel.TaskId_Skill1.Contains(Task_ID))//特殊支线任务解锁被动技能的

            {

                if (PlayerDatas.Instance.baseData.LV >= mainModel.TaskLv)

                {

@@ -147,6 +147,35 @@
                }

                return;

            }

            if (mainModel.WingTask == Task_ID && ((int)taskmodel.GetTaskStatus(Task_ID) == 0 || (int)taskmodel.GetTaskStatus(Task_ID) == -5))//关于特殊翅膀任务

            {

                if (playerPack.GetSinglePackModel(PackType.rptItem) == null)

                {

                    WindowCenter.Instance.Open<WingTaskJumpWin>();

                    return;

                }

                Dictionary<int, ItemModel> BackpackDic = playerPack.GetSinglePackModel(PackType.rptItem).GetPackModelIndexDict();

                if (BackpackDic == null)

                {

                    WindowCenter.Instance.Open<WingTaskJumpWin>();

                    return;

                }

                else

                {

                    int job = PlayerDatas.Instance.baseData.Job;

                    foreach (var key in BackpackDic.Keys)

                    {

                        ItemModel ItemM = BackpackDic[key];

                        if (ItemM.chinItemModel.Type == 111 && ItemM.chinItemModel.ExpireTime == 0 && ItemM.chinItemModel.JobLimit/100 == job)

                        {

                            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.KnapSackFunc1Type2);//跳到背包

                            return;

                        }

                    }

                }

                WindowCenter.Instance.Open<WingTaskJumpWin>();

                return;

            }

            switch ((int)taskmodel.GetTaskStatus(Task_ID))

            {

                case -5:


 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -812,6 +812,17 @@
                _MarkRay.gameObject.SetActive(false);

            }

            recordPositionBool = !recordPositionBool;

        }



        // 前期战斗用强制设置任务位置逻辑

        public void ForceShowTaskPanel()

        {

            if (onMainModel.IsBossAreaTask)

            {

                onMainModel.IsBossAreaTask = false;

            }

            m_TaskAndTeamPanel.localPosition = TaskListTipAnchor1.localPosition;

            TaskSwithBool = !TaskSwithBool;

        }



        void ArticleExperience()//关于经验条


 System/MainInterfacePanel/PlayerMainDate.cs

@@ -124,6 +124,8 @@
        }

        NetworkState = (int)SDKUtility.Instance.NetworkType;

        GetPassiveSkillTask();

        var WingsTask = Config.Instance.Get<FuncConfigConfig>("WingsTask");

        WingTask = int.Parse(WingsTask.Numerical1);

    }

    //----------关于某些副本可以进行地图挂机

    public List<int> OneKeyList = new List<int>();

@@ -139,7 +141,8 @@
    public int UnitPrice = 0;

    public int ItemNumber = 0;

    public int TaskLv = 0;//任务等级



    //-----关于支线翅膀任务的特殊逻辑

    public int WingTask = 0;

    private void GetPassiveSkillTask()//获取任务数据

    {

        TaskId_Skill.Clear();


 System/MainInterfacePanel/WingTaskJumpWin.cs

New file
@@ -0,0 +1,60 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [  Date ]:           Monday, August 27, 2018
//--------------------------------------------------------

using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
//特殊任务的翅膀任务
namespace Snxxz.UI {

    public class WingTaskJumpWin : Window
    {
        [SerializeField] Button m_Button1;
        [SerializeField] Button m_Button2;
        #region Built-in
        protected override void BindController()
        {
        }

        protected override void AddListeners()
        {
            m_Button1.AddListener(()=> 
            {

                Close();

                WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.StoreFunc2);

            });
            m_Button2.AddListener(()=> 
            {

                Close();

                WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.ComposeFunc1);

            });
        }

        protected override void OnPreOpen()
        {
        }

        protected override void OnAfterOpen()
        {
        }

        protected override void OnPreClose()
        {
        }

        protected override void OnAfterClose()
        {
        }
        #endregion
   
    }

}





 System/MainInterfacePanel/WingTaskJumpWin.cs.meta

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

 System/Team/TeamModel.cs

@@ -724,11 +724,7 @@
        {

            if (_leaveTeam.PlayerID == PlayerDatas.Instance.baseData.PlayerID)

            {

                if (!myTeam.iamCaptainer)

                {

                    ClearAllApplications();

                }



                myTeam.ClearMembers();

                if (myTeamRefreshEvent != null)

                {