少年修仙传客户端代码仓库
client_linchunjie
2019-04-24 f5a4f2d5ddb763c77d4464e597cc967c9b1fd26e
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
34个文件已修改
209 ■■■■■ 已修改文件
Lua/Gen/SnxxzUIItemOperateUtilityWrap.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Compose/New/ComposeMatCell.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/SeasonRewardCell.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/SegmentRewardCell.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/DailyQuest/ResourcesBackBoxBack.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/FairyAu/FairyAuTaskWin.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/FairyAu/FairyBossAwardWin.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/FairyAu/FamilyChangeNameWin.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/FriendSystem/MailPanel.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/HappyXB/HappyXBGetItemWin.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/HeavenBattle/HeavenBattleWin.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/HeavenBattle/XMZZCampVicRewardWin.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/BoxGetItemWin.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/ItemOperateUtility.cs 60 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/WashPointBatchUseWin.cs 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/New/ChooseItemWin.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/New/DepotWin.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/CoinTaskWin.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/FeaturesType3.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/TaskBoxBGMWin.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Message/RichTableEvent.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Mount/MountStoneTipsWin.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/OpenServerActivity/EntryInformationCell.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/OpenServerActivity/InSevenDayBehavior.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/OpenServerActivity/OpenServiceAchievementCell.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/OpenServerActivity/RewardInformation.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/OpenServerActivity/SpringFestivalCell.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Strengthening/GodBeastAttributes.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Strengthening/WingsRefined.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Vip/FirstChargeTrialWin.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Vip/LimitedTimePackageWin.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Vip/VipInvest/VipInvestWin.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Vip/VipWin.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Welfare/SignInGiftCell.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lua/Gen/SnxxzUIItemOperateUtilityWrap.cs
@@ -766,14 +766,8 @@
            
                Snxxz.UI.ItemOperateUtility gen_to_be_invoked = (Snxxz.UI.ItemOperateUtility)translator.FastGetCSObj(L, 1);
            
                
                {
                    Snxxz.UI.ItemAttrData _attrData = (Snxxz.UI.ItemAttrData)translator.GetObject(L, 2, typeof(Snxxz.UI.ItemAttrData));
                    gen_to_be_invoked.DismantleItem( _attrData );
                    
                    return 0;
                }
System/Compose/New/ComposeMatCell.cs
@@ -156,7 +156,6 @@
        private void ClickItemCell()
        {
            ItemConfig itemConfig = ItemConfig.Get(itemId);
            ItemAttrData attrData = null;
            switch (matType)
            {
                case NeedMatType.IncreaseItem:
System/CrossServerOneVsOne/SeasonRewardCell.cs
@@ -22,7 +22,6 @@
        [SerializeField] Image m_ImageColor;
        [SerializeField] Image m_ImageWorld;
        [SerializeField] Text m_Segmenttext;//段位
        ItemTipsModel _itemTipsModel;
        
        CrossServerOneVsOneRewardModel m_CrossServerRewardModel;
        CrossServerOneVsOneRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerOneVsOneRewardModel>()); } }
System/CrossServerOneVsOne/SegmentRewardCell.cs
@@ -18,7 +18,6 @@
        [SerializeField] GameObject m_IsDrawImage;//已领
        [SerializeField] GameObject m_IsReachImage;//未达成
        [SerializeField] GameObject m_IsMissImage;//已错过
        ItemTipsModel _itemTipsModel;
        
        CrossServerOneVsOneRewardModel m_CrossServerRewardModel;
        CrossServerOneVsOneRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerOneVsOneRewardModel>()); } }
System/DailyQuest/ResourcesBackBoxBack.cs
@@ -27,7 +27,6 @@
        [SerializeField] GameObject m_Type_One;//类型1
        ResourcesBackModel m_ResourcesBackModel;
        ResourcesBackModel resourcesBackModel { get { return m_ResourcesBackModel ?? (m_ResourcesBackModel = ModelCenter.Instance.GetModel<ResourcesBackModel>()); } }
        ItemTipsModel _itemTipsModel;
        
        public static bool isBool = false;//是否绑玉找回
        public bool IsOneKeyBool = false;//是否一键
System/FairyAu/FairyAuTaskWin.cs
@@ -42,7 +42,6 @@
        private ImpactRankModel.RankAwardItem RankAwardItem = new ImpactRankModel.RankAwardItem();//新增奖励物品
        TaskModel m_TaskModel;
        TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } }
        ItemTipsModel _itemTipsModel;
        
        PlayerMainDate m_MainModel;
        PlayerMainDate mainModel { get { return m_MainModel ?? (m_MainModel = ModelCenter.Instance.GetModel<PlayerMainDate>()); } }
System/FairyAu/FairyBossAwardWin.cs
@@ -19,14 +19,6 @@
        [SerializeField] Button close;
        [SerializeField] ScrollerController m_AwardCtrl;
        [SerializeField, Header("每行奖励个数")] int m_AwardLineCnt = 5;
        ItemTipsModel _itemTipsModel;
        ItemTipsModel itemTipsModel
        {
            get
            {
                return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>());
            }
        }
        FairyBossModel m_Model;
        FairyBossModel model
System/FairyAu/FamilyChangeNameWin.cs
@@ -27,14 +27,6 @@
                return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<FairyModel>());
            }
        }
        ItemTipsModel _itemTipsModel;
        ItemTipsModel itemTipsModel
        {
            get
            {
                return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>());
            }
        }
        #region Built-in
        protected override void BindController()
        {
System/FriendSystem/MailPanel.cs
@@ -67,22 +67,12 @@
    private MailInfo _currentMailInfo;
    private int curMail = 0;
    ItemTipsModel _itemTipsModel;
    ItemTipsModel itemTipsModel
    {
        get
        {
            return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>());
        }
    }
    PackModel _playerPack;
    PackModel playerPack
    {
        get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); }
    }
    DogzModel dogzModel { get { return ModelCenter.Instance.GetModel<DogzModel>(); } }
    VirtualPackModel virtualPackModel { get { return ModelCenter.Instance.GetModel<VirtualPackModel>(); } }
    private void Awake()
System/HappyXB/HappyXBGetItemWin.cs
@@ -38,14 +38,6 @@
        HappyXBModel XBModel { get { return ModelCenter.Instance.GetModel<HappyXBModel>(); } }
        PackModel playerPack { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
        ItemTipsModel _itemTipsModel;
        ItemTipsModel itemTipsModel
        {
            get
            {
                return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>());
            }
        }
        bool isHaveFreeTime = false;
        List<GameObject> GetItemlist = new List<GameObject>();
System/HeavenBattle/HeavenBattleWin.cs
@@ -49,9 +49,6 @@
            get { return _dailyQuestModel ?? (_dailyQuestModel = ModelCenter.Instance.GetModel<DailyQuestModel>()); }
        }
        ItemTipsModel _itemTipsModel;
        List<int> victoryCntlist = new List<int>();
        List<GameRecInfo> reclist = null;
        private int remainTimes;
System/HeavenBattle/XMZZCampVicRewardWin.cs
@@ -11,15 +11,6 @@
        [SerializeField] Transform failParent;
        [SerializeField] Button closeBtn;
        ItemTipsModel _itemTipsModel;
        ItemTipsModel itemTipsModel
        {
            get
            {
                return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>());
            }
        }
        HeavenBattleModel _heavenModel;
        HeavenBattleModel heavenModel
        {
System/KnapSack/Logic/BoxGetItemWin.cs
@@ -32,12 +32,6 @@
            get { return boxModel ?? (boxModel = ModelCenter.Instance.GetModel<BoxGetItemModel>()); }
        }
        ItemTipsModel _itemTipsModel;
        ItemTipsModel itemTipsModel {
            get {
                return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>());
            }
        }
        FairylandCeremonyModel ceremonyModel { get { return ModelCenter.Instance.GetModel<FairylandCeremonyModel>(); } }
        [SerializeField] float scaleTime = 0.3f;
System/KnapSack/Logic/ItemOperateUtility.cs
@@ -903,66 +903,6 @@
        #endregion
        #region 拆解
        public void DismantleItem(ItemAttrData attrData)
        {
            var dismantleReturnlist = attrData.GetUseDataModel((int)ItemUseDataKey.itemDecompound);
            int needGridCnt = 0;
            int fixedMatcnt = 0;
            int unfixedMatId = 0;
            for (int i = 0; i < dismantleReturnlist.Count; i++)
            {
                if (i == 0)
                {
                    if (dismantleReturnlist[i] != 0)
                    {
                        needGridCnt += 1;
                        unfixedMatId = dismantleReturnlist[i];
                    }
                }
                else
                {
                    if ((i - 1) % 3 == 0)
                    {
                        if (dismantleReturnlist[i] != 0)
                        {
                            needGridCnt += 1;
                            fixedMatcnt += dismantleReturnlist[i + 1];
                        }
                    }
                }
            }
            int offsetGrid = needGridCnt - packModel.GetEmptyGridCount(PackType.Item);
            if (offsetGrid > 0)
            {
                SysNotifyMgr.Instance.ShowTip("BagFull102", attrData.itemConfig.ItemName, offsetGrid);
                return;
            }
            var itemConfig = ItemConfig.Get(unfixedMatId);
            if (itemConfig != null)
            {
                ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("PinkChaiRemind2", fixedMatcnt, itemConfig.LV),
                    (bool ok) =>
                    {
                        if (ok)
                        {
                            var decompound = new CA313_tagCMItemDecompound();
                            decompound.Index = (byte)attrData.index;
                            GameNetSystem.Instance.SendInfo(decompound);
                        }
                    });
            }
            else
            {
                var decompound = new CA313_tagCMItemDecompound();
                decompound.Index = (byte)attrData.index;
                GameNetSystem.Instance.SendInfo(decompound);
            }
        }
        #endregion
        #region 续费
        public void RenewalItem(string guid)
        {
System/KnapSack/Logic/WashPointBatchUseWin.cs
@@ -16,28 +16,10 @@
        [SerializeField] Button _closeBtn;
        #endregion
        ItemTipsModel _itemTipsModel;
        ItemTipsModel itemTipsModel
        {
            get
            {
                return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>());
            }
        }
        PackModel _playerPack;
        PackModel playerPack
        {
            get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); }
        }
        BuffModel _buffModel;
        BuffModel Buffmodel
        {
            get
            {
                return _buffModel ?? (_buffModel = ModelCenter.Instance.GetModel<BuffModel>());
            }
        }
        private ItemModel itemModel;
System/KnapSack/New/ChooseItemWin.cs
@@ -30,15 +30,6 @@
            get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); }
        }
        ItemTipsModel _itemTipsModel;
        ItemTipsModel itemTipsModel
        {
            get
            {
                return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>());
            }
        }
        int chooseId = 0;
        int useNum = 1;
        List<SelectBoxItemCell> GetList = new List<SelectBoxItemCell>();
System/KnapSack/New/DepotWin.cs
@@ -35,13 +35,6 @@
        private SinglePack packModel;
        ItemTipsModel _itemTipsModel;
        ItemTipsModel itemTipsModel {
            get {
                return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>());
            }
        }
        PackModel _playerPack;
        PackModel playerPack {
            get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); }
System/MainInterfacePanel/CoinTaskWin.cs
@@ -61,12 +61,6 @@
        TaskModel m_TaskModel;
        TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } }
        ItemTipsModel _itemTipsModel;
        PackModel _playerPack;
        PackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); } }
        PlayerMainDate m_MainModel;
        PlayerMainDate mainModel { get { return m_MainModel ?? (m_MainModel = ModelCenter.Instance.GetModel<PlayerMainDate>()); } }
System/MainInterfacePanel/FeaturesType3.cs
@@ -40,7 +40,6 @@
        [SerializeField] RedpointBehaviour m_RedPoint;
        FeatureNoticeModel featureNoticeModel { get { return ModelCenter.Instance.GetModel<FeatureNoticeModel>(); } }
        ItemTipsModel _itemTipsModel;
        
        public void GetTheFeatureID(int funcId)
        {
System/MainInterfacePanel/TaskBoxBGMWin.cs
@@ -34,9 +34,6 @@
        TaskModel m_TaskModel;
        TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } }
        ItemTipsModel _itemTipsModel;
        PackModel _playerPack;
        PackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); } }
System/Message/RichTableEvent.cs
@@ -6,13 +6,6 @@
public class RichTableEvent : TRichTextEvent
{
    ItemTipsModel _itemTipsModel;
    ItemTipsModel itemTipsModel {
        get {
            return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>());
        }
    }
    public RichTableEvent()
    {
        RichTextMgr.Inst.RegisterEvent(RichTextEventEnum.TABLE, this);
System/Mount/MountStoneTipsWin.cs
@@ -9,8 +9,6 @@
{
    public class MountStoneTipsWin : Window
    {
        ItemTipsModel _itemTipsModel;
        PackModel _playerPack;
        PackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); } }
System/OpenServerActivity/EntryInformationCell.cs
@@ -21,7 +21,6 @@
        [SerializeField] GameObject m_Draw;//已领取
        LoginRewardModel m_LoginRewardModel;
        LoginRewardModel loginRewardModel { get { return m_LoginRewardModel ?? (m_LoginRewardModel = ModelCenter.Instance.GetModel<LoginRewardModel>()); } }
        ItemTipsModel m_itemTipsModel;
        
        public void GetDisplayInformation(int id)
        {
System/OpenServerActivity/InSevenDayBehavior.cs
@@ -18,7 +18,6 @@
        [SerializeField] Text m_ItemNameTxt;
        [SerializeField] Text m_NewItemTxt;
        InSevenDayModel inSevenDayModel { get { return ModelCenter.Instance.GetModel<InSevenDayModel>(); } }
        ItemTipsModel _itemTipsModel;
        
        private void Start()
        {
System/OpenServerActivity/OpenServiceAchievementCell.cs
@@ -26,7 +26,6 @@
        [SerializeField] GameObject m_Draw;//已领取
        [SerializeField] Text m_TextNumber;//已领取次数
        OpenServiceAchievementModel model { get { return ModelCenter.Instance.GetModel<OpenServiceAchievementModel>(); } }
        ItemTipsModel _itemTipsModel;
        
        public override void Refresh(CellView cell)
        {
System/OpenServerActivity/RewardInformation.cs
@@ -21,7 +21,6 @@
        InSevenDayModel m_InSevenDayModel;
        InSevenDayModel inSevenDay { get { return m_InSevenDayModel ?? (m_InSevenDayModel = ModelCenter.Instance.GetModel<InSevenDayModel>()); } }
        ItemTipsModel _itemTipsModel;
        
        private void Start()
        {
System/OpenServerActivity/SpringFestivalCell.cs
@@ -26,7 +26,6 @@
        [SerializeField] GameObject m_Draw;//已领取
        [SerializeField] Text m_TextNumber;//已领取次数
        SpringFestivalModel model { get { return ModelCenter.Instance.GetModel<SpringFestivalModel>(); } }
        ItemTipsModel _itemTipsModel;
        
        public override void Refresh(CellView cell)
        {
System/Strengthening/GodBeastAttributes.cs
@@ -47,7 +47,6 @@
        DogzModel dogz_model { get { return Dogz_model ?? (Dogz_model = ModelCenter.Instance.GetModel<DogzModel>()); } }
        PackModel _playerPack;
        PackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); } }
        ItemTipsModel _itemTipsModel;
        
        GodBeastModel godBeastModel { get { return ModelCenter.Instance.GetModel<GodBeastModel>(); } }
        private int GodBeastNumber = 0;//神兽编号
System/Strengthening/WingsRefined.cs
@@ -39,9 +39,6 @@
    private List<int> intPetAbsorbTyp = new List<int>();
    Dictionary<int, WingRefineAttrModel> _DicWingRe = new Dictionary<int, WingRefineAttrModel>();//获取属性上限值
    ItemTipsModel _itemTipsModel;
    PackModel _playerPack;
    PackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); } }
System/Vip/FirstChargeTrialWin.cs
@@ -21,9 +21,6 @@
        public Vector3 RotateVector = new Vector3(0f, 1f, 0f);
        #region Built-in
        FirstTimeRechargeModel firstTimeRechargeModel { get { return ModelCenter.Instance.GetModel<FirstTimeRechargeModel>(); } }
        PackModel _playerPack;
        PackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); } }
        ItemTipsModel _itemTipsModel;
        
        protected override void BindController()
        {
System/Vip/LimitedTimePackageWin.cs
@@ -28,7 +28,6 @@
        private float time = 0;
        #region Built-in
        LimitedTimePackageItemClassModel limitedTimePackageItemModel { get { return ModelCenter.Instance.GetModel<LimitedTimePackageItemClassModel>(); } }
        ItemTipsModel _itemTipsModel;
        
        protected override void BindController()
        {
System/Vip/VipInvest/VipInvestWin.cs
@@ -17,8 +17,6 @@
        [SerializeField] Text m_FairyJadeText;//仙玉
        VipInvestModel _investModel;
        VipInvestModel investModel { get { return _investModel ?? (_investModel = ModelCenter.Instance.GetModel<VipInvestModel>()); } }
        ItemTipsModel _tipsModel;
        private List<InvestConfig> configlist;
        int cycle = 0;
System/Vip/VipWin.cs
@@ -144,15 +144,6 @@
        }
        #endregion
        ItemTipsModel _itemTipsModel;
        ItemTipsModel itemTipsModel
        {
            get
            {
                return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>());
            }
        }
        private void OnRight()
        {
            if (model.presentSelectVip < model.vipMaxLv)
System/Welfare/SignInGiftCell.cs
@@ -27,15 +27,6 @@
            }
        }
        ItemTipsModel _itemTipsModel;
        ItemTipsModel itemTipsModel
        {
            get
            {
                return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>());
            }
        }
        public override void Refresh(CellView cell)
        {
            var configs = ContinueSignInConfig.GetValues();