少年修仙传客户端代码仓库
client_Wu Xijin
2019-01-21 800370c40bbe308b0c7d33e463f54b1d80ad0b52
5920 【前端】【1.5.100】诛仙塔功能开发
4个文件已添加
7个文件已修改
299 ■■■■■ 已修改文件
Core/GameEngine/Model/Config/JadeDynastyTowerConfig.cs 95 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/Config/JadeDynastyTowerConfig.cs.meta 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/ConfigManager.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/DailyQuest/DailyQuestWin.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyTower/JadeDynastyTowerModel.cs 80 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyTower/TowerWin.cs 85 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyTower/TowerWin.cs.meta 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/HighSettingTip.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/RuneTower/RuneNewGotWin.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/RuneTower/RuneTowerWin.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/WindowJump/WindowJumpMgr.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/Config/JadeDynastyTowerConfig.cs
New file
@@ -0,0 +1,95 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Monday, January 21, 2019
//--------------------------------------------------------
using UnityEngine;
using System;
namespace TableConfig {
    public partial class JadeDynastyTowerConfig : ConfigBase {
        public int floorId { get ; private set ; }
        public string floorName { get ; private set; }
        public int[] rewardIdsLevelS;
        public int[] rewardCountsLevelS;
        public int[] rewardIdsLevelA;
        public int[] rewardCountsLevelA;
        public int[] rewardIdsLevelB;
        public int[] rewardCountsLevelB;
        public int unLockEquipPlace { get ; private set ; }
        public int fightPower { get ; private set ; }
        public override string getKey()
        {
            return floorId.ToString();
        }
        public override void Parse() {
            try
            {
                floorId=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0;
                floorName = rawContents[1].Trim();
                string[] rewardIdsLevelSStringArray = rawContents[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                rewardIdsLevelS = new int[rewardIdsLevelSStringArray.Length];
                for (int i=0;i<rewardIdsLevelSStringArray.Length;i++)
                {
                     int.TryParse(rewardIdsLevelSStringArray[i],out rewardIdsLevelS[i]);
                }
                string[] rewardCountsLevelSStringArray = rawContents[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                rewardCountsLevelS = new int[rewardCountsLevelSStringArray.Length];
                for (int i=0;i<rewardCountsLevelSStringArray.Length;i++)
                {
                     int.TryParse(rewardCountsLevelSStringArray[i],out rewardCountsLevelS[i]);
                }
                string[] rewardIdsLevelAStringArray = rawContents[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                rewardIdsLevelA = new int[rewardIdsLevelAStringArray.Length];
                for (int i=0;i<rewardIdsLevelAStringArray.Length;i++)
                {
                     int.TryParse(rewardIdsLevelAStringArray[i],out rewardIdsLevelA[i]);
                }
                string[] rewardCountsLevelAStringArray = rawContents[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                rewardCountsLevelA = new int[rewardCountsLevelAStringArray.Length];
                for (int i=0;i<rewardCountsLevelAStringArray.Length;i++)
                {
                     int.TryParse(rewardCountsLevelAStringArray[i],out rewardCountsLevelA[i]);
                }
                string[] rewardIdsLevelBStringArray = rawContents[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                rewardIdsLevelB = new int[rewardIdsLevelBStringArray.Length];
                for (int i=0;i<rewardIdsLevelBStringArray.Length;i++)
                {
                     int.TryParse(rewardIdsLevelBStringArray[i],out rewardIdsLevelB[i]);
                }
                string[] rewardCountsLevelBStringArray = rawContents[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                rewardCountsLevelB = new int[rewardCountsLevelBStringArray.Length];
                for (int i=0;i<rewardCountsLevelBStringArray.Length;i++)
                {
                     int.TryParse(rewardCountsLevelBStringArray[i],out rewardCountsLevelB[i]);
                }
                unLockEquipPlace=IsNumeric(rawContents[8]) ? int.Parse(rawContents[8]):0;
                fightPower=IsNumeric(rawContents[9]) ? int.Parse(rawContents[9]):0;
            }
            catch (Exception ex)
            {
                DebugEx.Log(ex);
            }
        }
    }
}
Core/GameEngine/Model/Config/JadeDynastyTowerConfig.cs.meta
New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: bcb7d8fc32f347441a4024465ce1df51
timeCreated: 1548041359
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData:
  assetBundleName:
  assetBundleVariant:
Core/GameEngine/Model/ConfigManager.cs
@@ -225,6 +225,7 @@
        AddAsyncTask<FashionDressConfig>();
        AddAsyncTask<WeekPartyPointConfig>();
        AddAsyncTask<SceneReplaceConfig>();
        AddAsyncTask<JadeDynastyTowerConfig>();
        while (!AllCompleted())
        {
System/DailyQuest/DailyQuestWin.cs
@@ -269,7 +269,7 @@
                case DailyQuestType.RuneTowerSweep:
                    RuneTowerWin.guideSweep = true;
                    WindowCenter.Instance.CloseImmediately<DailyQuestWin>();
                    WindowCenter.Instance.Open<RuneTowerWin>();
                    WindowCenter.Instance.Open<TowerWin>(false,0);
                    break;
                case DailyQuestType.BossHome:
                    WindowCenter.Instance.CloseImmediately<DailyQuestWin>();
@@ -285,7 +285,7 @@
                    break;
                case DailyQuestType.RuneTower:
                    WindowCenter.Instance.CloseImmediately<DailyQuestWin>();
                    WindowCenter.Instance.Open<RuneTowerWin>();
                    WindowCenter.Instance.Open<TowerWin>(false, 0);
                    break;
                case DailyQuestType.TreasureCollectSoul:
                    GotoTreasureCollectSoul();
System/JadeDynastyTower/JadeDynastyTowerModel.cs
@@ -2,15 +2,75 @@
using System.Collections.Generic;
using UnityEngine;
public class JadeDynastyTowerModel : MonoBehaviour {
namespace Snxxz.UI
{
    public class JadeDynastyTowerModel : Model, IPlayerLoginOk, IMapInitOk
    {
        const int DATA_MAPID = 0;
        const int REDPOINTID = 1;
    // Use this for initialization
    void Start () {
    }
    // Update is called once per frame
    void Update () {
    }
        public int currentFloor { get; private set; }
        Redpoint redpoint = new Redpoint(REDPOINTID);
        public override void Init()
        {
        }
        public override void UnInit()
        {
        }
        public void RequestChallenge()
        {
            var error = GetErrorOfChallenge();
            if (error == 0)
            {
            }
            else
            {
            }
        }
        public bool IsChallengable()
        {
            return GetErrorOfChallenge() == 0;
        }
        private int GetErrorOfChallenge()
        {
            return 0;
        }
        public void RequestRefreshMonster()
        {
        }
        public void RequestSetDungeonAction()
        {
            var sendInfo = new CA508_tagCMDoFBAction();
            sendInfo.ActionType = 0;
            sendInfo.ActionInfo = (uint)currentFloor;
            GameNetSystem.Instance.SendInfo(sendInfo);
        }
        public void OnPlayerLoginOk()
        {
        }
        public void OnMapInitOk()
        {
            switch (PlayerDatas.Instance.baseData.MapID)
            {
                case DATA_MAPID:
                    RequestSetDungeonAction();
                    break;
            }
        }
    }
}
System/JadeDynastyTower/TowerWin.cs
New file
@@ -0,0 +1,85 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [  Date ]:           Monday, January 21, 2019
//--------------------------------------------------------
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
namespace Snxxz.UI
{
    public class TowerWin : Window
    {
        [SerializeField] FunctionButtonGroup m_FunctionGroup;
        [SerializeField] FunctionButton m_RuneTower;
        [SerializeField] FunctionButton m_JadeDynastyTower;
        #region Built-in
        protected override void BindController()
        {
        }
        protected override void AddListeners()
        {
            m_RuneTower.SetListener(OpenRuneTower);
            m_JadeDynastyTower.SetListener(OpenJadeDynastyTower);
        }
        protected override void OnPreOpen()
        {
        }
        protected override void OnAfterOpen()
        {
        }
        protected override void OnPreClose()
        {
            CloseSubWindows();
        }
        protected override void OnAfterClose()
        {
        }
        protected override void OnActived()
        {
            base.OnActived();
            OpenRuneTower();
        }
        #endregion
        private void OpenRuneTower()
        {
            CloseSubWindows();
            WindowCenter.Instance.Open<RuneTowerWin>(true);
            functionOrder = m_RuneTower.order;
        }
        private void OpenJadeDynastyTower()
        {
            CloseSubWindows();
            WindowCenter.Instance.Open<JadeDynastyTowerWin>(true);
            functionOrder = m_JadeDynastyTower.order;
        }
        private void CloseSubWindows()
        {
            var windows = WindowConfig.Get().FindChildWindows("TowerWin");
            foreach (var item in windows)
            {
                WindowCenter.Instance.Close(item);
            }
        }
    }
}
System/JadeDynastyTower/TowerWin.cs.meta
New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 8cc7d59e2c390fc45b2f054b45bdc4c7
timeCreated: 1548042171
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData:
  assetBundleName:
  assetBundleVariant:
System/MainInterfacePanel/HighSettingTip.cs
@@ -293,7 +293,7 @@
        void RuneTaButton()//符印塔
        {
            WindowCenter.Instance.Close<MainInterfaceWin>();
            WindowCenter.Instance.Open<RuneTowerWin>();
            WindowCenter.Instance.Open<TowerWin>(false, 0);
        }
        void OpenTreasure()
        {
System/RuneTower/RuneNewGotWin.cs
@@ -87,7 +87,7 @@
            CloseClick();
            WindowCenter.Instance.Close<MainInterfaceWin>();
            WindowCenter.Instance.Open<RuneTowerWin>();
            WindowCenter.Instance.Open<TowerWin>(false, 0);
        }
    }
System/RuneTower/RuneTowerWin.cs
@@ -49,7 +49,6 @@
        [SerializeField] Button m_Sweep;
        [SerializeField] Text m_SweepButtonDescription;
        [SerializeField] Text m_SweepTip;
        [SerializeField] Button m_Close;
        ShowType showType = ShowType.RewardInfo;
        int runeSweepActionId = 0;
@@ -65,7 +64,6 @@
        protected override void AddListeners()
        {
            m_Close.AddListener(CloseClick);
            m_ViewBoss.AddListener(PopupBossInfo);
            m_ViewReward.AddListener(PopupRewardInfo);
            m_ViewPassedInfo.AddListener(PopupTowerPassInfo);
System/WindowJump/WindowJumpMgr.cs
@@ -406,11 +406,11 @@
                SetJumpLogic<VipExperienceWin>(_tagWinSearchModel.TABID);
                break;
            case JumpUIType.RuneTower:
                SetJumpLogic<RuneTowerWin>(_tagWinSearchModel.TABID);
                SetJumpLogic<TowerWin>(_tagWinSearchModel.TABID);
                break;
            case JumpUIType.RuneTowerSpec:
                RuneTowerWin.guideChallenge = true;
                SetJumpLogic<RuneTowerWin>(_tagWinSearchModel.TABID);
                SetJumpLogic<TowerWin>(_tagWinSearchModel.TABID);
                break;
            case JumpUIType.WelfareFunc1:
            case JumpUIType.WelfareFunc2: