少年修仙传客户端代码仓库
client_linchunjie
2018-08-15 6a7e18e67423da68c7fc452243a2706e35a19e93
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
5个文件已修改
130 ■■■■■ 已修改文件
System/DailyQuest/DailyQuestRealmPracticeBehaviour.cs 64 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/SelectBoxItemCell.cs 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/HighSettingTip.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/OpenServerActivity/OpenServerActivityWin.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Vip/LimitedTimePackageModel.cs 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/DailyQuest/DailyQuestRealmPracticeBehaviour.cs
@@ -16,8 +16,8 @@
        [SerializeField] Button m_GotoRealm;
        [SerializeField] Slider m_PracticePointSlider;
        [SerializeField] RectTransform m_RealmContainer; 
        [SerializeField] Text m_RealmStateDescription;
        [SerializeField] Image m_Realm;
        [SerializeField] Image m_RealmState;
        [SerializeField] Text m_PracticePoint;
        [SerializeField] Text m_PractivePointNeed;
        [SerializeField] Text m_GotoRealmLevelUpHint;
@@ -89,14 +89,36 @@
        private void UpdatePraceticePoint(bool _rightNow)
        {
            var isMaxRealm = realmModel.realmMaxLevel == PlayerDatas.Instance.baseData.realmLevel;
            var realmConfig = ConfigManager.Instance.GetTemplate<RealmConfig>(PlayerDatas.Instance.baseData.realmLevel);
            var pointNeed = realmConfig.NeedPoint;
            var pointOwn = PlayerDatas.Instance.extersion.realmPoint;
            m_RealmContainer.gameObject.SetActive(realmConfig != null && realmConfig.Lv > 0);
            if (realmConfig != null && realmConfig.Lv > 0)
            if (isMaxRealm)
            {
                m_Realm.SetSprite(realmConfig.Img);
                m_GotoRealmLevelUpHint.gameObject.SetActive(false);
                realmConfig = ConfigManager.Instance.GetTemplate<RealmConfig>(PlayerDatas.Instance.baseData.realmLevel);
                m_RealmStateDescription.text = Language.Get("DailyquestHighestRealm");
            }
            else
            {
                m_GotoRealmLevelUpHint.gameObject.SetActive(true);
                if (pointOwn >= pointNeed)
                {
                    m_GotoRealmLevelUpHint.text = Language.Get("DailyquestRealm2");
                }
                else
                {
                    m_GotoRealmLevelUpHint.text = Language.Get("RealmCollecting", pointNeed - pointOwn);
                }
                m_RealmStateDescription.text = Language.Get("DailyquestNextRealm");
            }
            var nextRealmConfig = ConfigManager.Instance.GetTemplate<RealmConfig>(PlayerDatas.Instance.baseData.realmLevel + (isMaxRealm ? 0 : 1));
            m_RealmContainer.gameObject.SetActive(nextRealmConfig != null && nextRealmConfig.Lv > 0);
            if (nextRealmConfig != null && nextRealmConfig.Lv > 0)
            {
                m_Realm.SetSprite(nextRealmConfig.Img);
            }
            m_PractivePointNeed.text = StringUtility.Contact("/", pointNeed);
@@ -111,40 +133,6 @@
                StartCoroutine(Co_PointIncreasePerformance(new PointPerformance() { startPoint = piontBuf, endPoint = pointOwn }));
                piontBuf = pointOwn;
            }
            if (pointOwn >= pointNeed)
            {
                m_GotoRealmLevelUpHint.text = Language.Get("DailyquestRealm2");
                m_RealmState.SetSprite("JJ_TB_1");
            }
            else
            {
                m_GotoRealmLevelUpHint.text = Language.Get("RealmCollecting", pointNeed - pointOwn);
                m_RealmState.SetSprite("JJ_TB_2");
            }
            //switch (PlayerDatas.Instance.realm.prensentRealmState)
            //{
            //    case PlayerRealmData.RealmState.Collecting:
            //        if (pointOwn >= pointNeed)
            //        {
            //            m_GotoRealmLevelUpHint.text = Language.Get("DailyquestRealm2");
            //        }
            //        else
            //        {
            //            m_GotoRealmLevelUpHint.text = Language.Get("RealmCollecting", pointNeed - pointOwn);
            //        }
            //        m_RealmState.SetSprite("JJ_TB_1");
            //        break;
            //    //case PlayerRealmData.RealmState.Dungeon:
            //    //    m_GotoRealmLevelUpHint.text = Language.Get("DailyquestRealm3");
            //    //    m_RealmState.SetSprite("JJ_TB_2");
            //    //    break;
            //    //case PlayerRealmData.RealmState.LevelUp:
            //    //    m_GotoRealmLevelUpHint.text = Language.Get("DailyquestRealm4");
            //    //    m_RealmState.SetSprite("JJ_TB_3");
            //    //    break;
            //}
        }
System/KnapSack/Logic/SelectBoxItemCell.cs
@@ -35,7 +35,12 @@
            nameText.text = itemConfig.ItemName;
            ItemCellModel cellModel = new ItemCellModel(id, false, (ulong)BoxModel.selectDict[id]);
            itemBaisc.Init(cellModel);
            haveCntText.text = playerPack.GetItemCountByID(PackType.rptItem, id).ToString();
            int haveCnt = playerPack.GetItemCountByID(PackType.rptItem, id);
            if(haveCnt <= 0)
            {
                haveCnt = ModelCenter.Instance.GetModel<RuneModel>().GetRuneCountById(id);
            }
            haveCntText.text = haveCnt.ToString();
            SetIsChoose(false);
        }
System/MainInterfacePanel/HighSettingTip.cs
@@ -317,7 +317,7 @@
        void OnCliCkLimitedTimePBtn()//限时礼包
        {
            WindowCenter.Instance.Close<MainInterfaceWin>();
            WindowCenter.Instance.Open<LimitedTimePackageWin>();
            WindowCenter.Instance.Open<OpenServerActivityWin>(false,7);
        }
        void OnClickElfFestivalBtn()
System/OpenServerActivity/OpenServerActivityWin.cs
@@ -394,6 +394,16 @@
                        WindowCenter.Instance.Open<OpenServerGiftWin>(true);
                    }
                    break;
                case 7:
                    if (windowState == WindowState.Opened)
                    {
                        WindowCenter.Instance.OpenWithoutAnimation<LimitedTimePackageWin>();
                    }
                    else
                    {
                        WindowCenter.Instance.Open<LimitedTimePackageWin>(true);
                    }
                    break;
                case 8:
                    if (windowState == WindowState.Opened)
                    {
@@ -445,6 +455,7 @@
            WindowCenter.Instance.CloseImmediately<NPracticePointWin>();
            WindowCenter.Instance.CloseImmediately<BossRebornWin>();
            WindowCenter.Instance.CloseImmediately<OpenServerGiftWin>();
            WindowCenter.Instance.CloseImmediately<LimitedTimePackageWin>();
        }
        private int Compare(int x, int y)
System/Vip/LimitedTimePackageModel.cs
@@ -10,15 +10,38 @@
using TableConfig;
using UnityEngine;
public class LimitedTimePackageItemClassModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
public class LimitedTimePackageItemClassModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk, IOpenServerActivity
{
    public Dictionary<int, int> DicBuyPackage = new Dictionary<int, int>();
    public event Action UpdateLimitedTimePackageItem;
    public event Action<int> onStateUpate;
    public override void Init()
    {
        OpenServerActivityCenter.Instance.Register(7, this);
        OperationTimeHepler.Instance.operationEndEvent += OperationEndEvent;
    }
    public bool IsShowPanel = false;
    public bool IsOpen
    {
        get
        {
            return IsExpired();
        }
    }
    public bool priorityOpen
    {
        get
        {
            return false;
        }
    }
    public void OnBeforePlayerDataInitialize()
    {
        IsShowPanel = false;
@@ -41,6 +64,21 @@
        if (arg1 == Operation.GiftPackage)
        {
            IsShowTip();
            if (arg2 == 0 && onStateUpate != null)
            {
                onStateUpate(7);
            }
        }
    }
    private void OperationEndEvent(Operation arg1, int arg2)
    {
        if (arg1 == Operation.GiftPackage && arg2 == 0)
        {
            if (onStateUpate != null)
            {
                onStateUpate(7);
            }
        }
    }
@@ -74,6 +112,10 @@
        {
            UpdateLimitedTimePackageItem();
        }
        if (onStateUpate != null)
        {
            onStateUpate(7);
        }
    }
    public void OpenFreePlat(string Title, float RMBNum, string OrderInfo)
    {