少年修仙传客户端代码仓库
client_linchunjie
2018-12-27 7b5e0eea4360da63ca52aa329415f58372aedef1
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
6个文件已修改
42 ■■■■ 已修改文件
Fight/GameActor/GA_Hero.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Compose/New/ComposeWin.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Compose/New/ComposeWinModel.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/CrossServerOneVsOneHonorShopCell.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/HighSettingTip.cs 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/WindowJump/WindowJumpMgr.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/GameActor/GA_Hero.cs
@@ -984,6 +984,8 @@
    PlayerTaskDatas m_TaskModel;
    PlayerTaskDatas taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); } }
    PlayerMainDate m_MainModel;
    PlayerMainDate onMainModel { get { return m_MainModel ?? (m_MainModel = ModelCenter.Instance.GetModel<PlayerMainDate>()); } }
    private void UpdateAutoStartFight()
    {
        if (DTCB105_tagMCPlayerWallow.forceOffLine)
@@ -1001,7 +1003,15 @@
                 && !NewBieCenter.Instance.inGuiding
                 && PlayerTaskDatas.IsOPenAutoResolve())
            {
                SnxxzGame.Instance.StartCoroutine(Wait());
                if (PlayerDatas.Instance.hero != null && PlayerDatas.Instance.hero.State == E_ActorState.AutoRun
             && onMainModel.MoveBool)
                {
                }
                else
                {
                    SnxxzGame.Instance.StartCoroutine(Wait());
                }
            }
        }
System/Compose/New/ComposeWin.cs
@@ -254,7 +254,6 @@
        private void OnClickWingsCompose()
        {
            CloseSubWindows();
            if (windowState == WindowState.Opened)
            {
@@ -270,6 +269,7 @@
        private void GatherSoulCompose()
        {
            ComposeModel.SetCurComposeModel(null);
            CloseSubWindows();
            if (windowState == WindowState.Opened)
            {
System/Compose/New/ComposeWinModel.cs
@@ -1290,6 +1290,7 @@
    Equip = 4,
    Item = 5,
    MountDogz = 6,
    GatherSoul = 7,
}
public enum NeedMatType
System/CrossServerOneVsOne/CrossServerOneVsOneHonorShopCell.cs
@@ -86,6 +86,7 @@
                }
                else
                {
                    stateImg.gameObject.SetActive(false);
                    sellImg.gameObject.SetActive(true);
                    itemCell.countText.text = StringUtility.Contact(UIHelper.AppendStringColor(TextColType.Red, remainNum.ToString()),
                        "/" + canBuyCnt.ToString());
System/MainInterfacePanel/HighSettingTip.cs
@@ -60,7 +60,7 @@
        StoreModel storeModel { get { return ModelCenter.Instance.GetModel<StoreModel>(); } }
        OSGiftModel osGiftModel { get { return ModelCenter.Instance.GetModel<OSGiftModel>(); } }
        PlayerMainDate mainModel { get { return ModelCenter.Instance.GetModel<PlayerMainDate>(); } }
        CrossServerOneVsOneModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>(); } }
        FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }
        private void Start()
        {
@@ -364,9 +364,26 @@
        }
        void OnClickCrossServerBtn()//跨服PK
        {
            WindowCenter.Instance.Close<MainInterfaceWin>();
            WindowCenter.Instance.Open<CrossServerWin>();
            int limitlv = Config.Instance.Get<FuncOpenLVConfig>(157).LimitLV;
            if (FuncOpen.Instance.IsFuncOpen(157)&& TimeUtility.OpenDay >= crossServerModel.afterOpenDayOpenCross)
            {
                WindowCenter.Instance.Close<MainInterfaceWin>();
                WindowCenter.Instance.Open<CrossServerWin>();
            }
            else
            {
                if (PlayerDatas.Instance.baseData.LV >= limitlv)
                {
                    SysNotifyMgr.Instance.ShowTip("CrossMatching14", limitlv);
                }
                else
                {
                    SysNotifyMgr.Instance.ShowTip("CrossMatching15", crossServerModel.afterOpenDayOpenCross);
                }
            }
        }
        public void ShowButton()//向上
        {
System/WindowJump/WindowJumpMgr.cs
@@ -175,7 +175,10 @@
            case JumpUIType.ComposeFunc5:
            case JumpUIType.TicketCompose1:
            case JumpUIType.TicketCompose2:
                SetJumpLogic<ComposeWin>(_tagWinSearchModel.TABID);
                break;
            case JumpUIType.GatherSoul271:
                composeModel.SetCurComposeModel(null);
                SetJumpLogic<ComposeWin>(_tagWinSearchModel.TABID);
                break;
            case JumpUIType.EquipCompose1: