5398 子 【开发】【1.4】跨服竞技场 / 【前端】【1.4】跨服竞技场开发

Client_PangDeRong

2018-12-26 12032f03912564129e7fb3b9e6d07ba04d33d7f9

5398 子 【开发】【1.4】跨服竞技场 / 【前端】【1.4】跨服竞技场开发

 Lua/Gen/SnxxzUICrossServerOneVsOneModelWrap.cs

File was renamed from Lua/Gen/SnxxzUICrossServerModelWrap.cs
@@ -15,13 +15,13 @@
namespace XLua.CSObjectWrap
{
    using Utils = XLua.Utils;
    public class SnxxzUICrossServerModelWrap 
    public class SnxxzUICrossServerOneVsOneModelWrap 
    {
        public static void __Register(RealStatePtr L)
        {
            ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            System.Type type = typeof(Snxxz.UI.CrossServerOneVsOneModel);
            Utils.BeginObjectRegister(type, L, translator, 0, 16, 14, 6);
            Utils.BeginObjectRegister(type, L, translator, 0, 19, 14, 5);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnBeforePlayerDataInitialize", _m_OnBeforePlayerDataInitialize);
@@ -30,35 +30,37 @@
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnPlayerLoginOk", _m_OnPlayerLoginOk);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "UnInit", _m_UnInit);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "UpdateDayAwardState", _m_UpdateDayAwardState);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "SortDayAwardsList", _m_SortDayAwardsList);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetDayAwardsList", _m_GetDayAwardsList);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "CompareByCompleteProgress", _m_CompareByCompleteProgress);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "UpdatePKResultInfo", _m_UpdatePKResultInfo);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "SendCrossMatch", _m_SendCrossMatch);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "SendBuyMatchCount", _m_SendBuyMatchCount);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnReceivePackage", _m_OnReceivePackage);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "TryGetOneVsOneHistory", _m_TryGetOneVsOneHistory);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "SetPkInfoLocalSave", _m_SetPkInfoLocalSave);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "UpdateCrossArenaRedpoint", _m_UpdateCrossArenaRedpoint);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "UpdateDayAwardsEvent", _e_UpdateDayAwardsEvent);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "UpdatePkResultEvent", _e_UpdatePkResultEvent);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "oneVsOneHistoryRefresh", _e_oneVsOneHistoryRefresh);
            
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "PkResultLocalSaveKey", _g_get_PkResultLocalSaveKey);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "localSaveResults", _g_get_localSaveResults);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "IsMatching", _g_get_IsMatching);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "matchStartTime", _g_get_matchStartTime);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "roundEndTime", _g_get_roundEndTime);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "freeMaxMatchNum", _g_get_freeMaxMatchNum);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "buyMaxMatchNum", _g_get_buyMaxMatchNum);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "priceFormula", _g_get_priceFormula);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "winStreakScoreFormula", _g_get_winStreakScoreFormula);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "dayAwardTypelist", _g_get_dayAwardTypelist);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "pkResultInfo", _g_get_pkResultInfo);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "sortDayAwardslist", _g_get_sortDayAwardslist);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "crossArenaRedpoint", _g_get_crossArenaRedpoint);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "crossDayAwardsRedpoint", _g_get_crossDayAwardsRedpoint);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "crossMatchRedpoint", _g_get_crossMatchRedpoint);
            
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "IsMatching", _s_set_IsMatching);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "matchStartTime", _s_set_matchStartTime);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "sortDayAwardslist", _s_set_sortDayAwardslist);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "crossArenaRedpoint", _s_set_crossArenaRedpoint);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "crossDayAwardsRedpoint", _s_set_crossDayAwardsRedpoint);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "crossMatchRedpoint", _s_set_crossMatchRedpoint);
@@ -100,7 +102,7 @@
            catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return LuaAPI.luaL_error(L, "invalid arguments to Snxxz.UI.CrossServerModel constructor!");
            return LuaAPI.luaL_error(L, "invalid arguments to Snxxz.UI.CrossServerOneVsOneModel constructor!");
            
        }
        
@@ -301,7 +303,7 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_SortDayAwardsList(RealStatePtr L)
        static int _m_GetDayAwardsList(RealStatePtr L)
        {
            try {
            
@@ -314,11 +316,12 @@
                
                {
                    
                    gen_to_be_invoked.SortDayAwardsList(  );
                        System.Collections.Generic.List<Snxxz.UI.CrossServerOneVsOneModel.AwardType> gen_ret = gen_to_be_invoked.GetDayAwardsList(  );
                        translator.Push(L, gen_ret);
                    
                    
                    
                    return 0;
                    return 1;
                }
                
            } catch(System.Exception gen_e) {
@@ -432,6 +435,66 @@
                    
                    
                    return 0;
                }
                
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_OnReceivePackage(RealStatePtr L)
        {
            try {
            
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
            
            
                
                {
                    HC103_tagMCCrossRealmPKPlayerHisSeasonInfo _package = (HC103_tagMCCrossRealmPKPlayerHisSeasonInfo)translator.GetObject(L, 2, typeof(HC103_tagMCCrossRealmPKPlayerHisSeasonInfo));
                    
                    gen_to_be_invoked.OnReceivePackage( _package );
                    
                    
                    
                    return 0;
                }
                
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_TryGetOneVsOneHistory(RealStatePtr L)
        {
            try {
            
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
            
            
                
                {
                    int _session = LuaAPI.xlua_tointeger(L, 2);
                    Snxxz.UI.CrossServerOneVsOneModel.CrossServerOneVsOneHistory _history;
                    
                        bool gen_ret = gen_to_be_invoked.TryGetOneVsOneHistory( _session, out _history );
                        LuaAPI.lua_pushboolean(L, gen_ret);
                    translator.Push(L, _history);
                        
                    
                    
                    
                    return 2;
                }
                
            } catch(System.Exception gen_e) {
@@ -555,6 +618,20 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_roundEndTime(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.roundEndTime);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_freeMaxMatchNum(RealStatePtr L)
        {
            try {
@@ -639,20 +716,6 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_sortDayAwardslist(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.sortDayAwardslist);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_crossArenaRedpoint(RealStatePtr L)
        {
            try {
@@ -720,21 +783,6 @@
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                System.DateTime gen_value;translator.Get(L, 2, out gen_value);
                gen_to_be_invoked.matchStartTime = gen_value;
            
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 0;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _s_set_sortDayAwardslist(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                gen_to_be_invoked.sortDayAwardslist = (System.Collections.Generic.List<Snxxz.UI.CrossServerOneVsOneModel.AwardType>)translator.GetObject(L, 2, typeof(System.Collections.Generic.List<Snxxz.UI.CrossServerOneVsOneModel.AwardType>));
            
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
@@ -819,7 +867,7 @@
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            LuaAPI.luaL_error(L, "invalid arguments to Snxxz.UI.CrossServerModel.UpdateDayAwardsEvent!");
            LuaAPI.luaL_error(L, "invalid arguments to Snxxz.UI.CrossServerOneVsOneModel.UpdateDayAwardsEvent!");
            return 0;
        }
        
@@ -853,7 +901,41 @@
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            LuaAPI.luaL_error(L, "invalid arguments to Snxxz.UI.CrossServerModel.UpdatePkResultEvent!");
            LuaAPI.luaL_error(L, "invalid arguments to Snxxz.UI.CrossServerOneVsOneModel.UpdatePkResultEvent!");
            return 0;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _e_oneVsOneHistoryRefresh(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                int gen_param_count = LuaAPI.lua_gettop(L);
            Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                System.Action gen_delegate = translator.GetDelegate<System.Action>(L, 3);
                if (gen_delegate == null) {
                    return LuaAPI.luaL_error(L, "#3 need System.Action!");
                }
				
                if (gen_param_count == 3)
                {
					
                    if (LuaAPI.xlua_is_eq_str(L, 2, "+")) {
                        gen_to_be_invoked.oneVsOneHistoryRefresh += gen_delegate;
                        return 0;
                    } 
					
					
                    if (LuaAPI.xlua_is_eq_str(L, 2, "-")) {
                        gen_to_be_invoked.oneVsOneHistoryRefresh -= gen_delegate;
                        return 0;
                    } 
					
                }
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            LuaAPI.luaL_error(L, "invalid arguments to Snxxz.UI.CrossServerOneVsOneModel.oneVsOneHistoryRefresh!");
            return 0;
        }
        

 Lua/Gen/SnxxzUICrossServerOneVsOneModelWrap.cs.meta

File was renamed from Lua/Gen/SnxxzUICrossServerModelWrap.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: c4b4bb32d295ad84b88e554fb5d9bc10
timeCreated: 1545374466
guid: 287f2992ccb8c74419cbb26d17d3d040
timeCreated: 1545806644
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs

@@ -186,8 +186,12 @@
        private void ClickBuyTimes()

        {

            int remainNum = CrossServerOneVsOnePlayerInfo.Instance.GetDayRemainNum();

            if (remainNum >= crossServerModel.freeMaxMatchNum) return;



            if (remainNum >= crossServerModel.freeMaxMatchNum)

            {

                SysNotifyMgr.Instance.ShowTip("CrossMatching13");

                return;

            }

         
            WindowCenter.Instance.Open<CrossSeverOneVsOneBuyMatchTimesWin>();

        }




 System/CrossServerOneVsOne/CrossServerOneVsOneCyclicScroll.cs

@@ -32,8 +32,7 @@


        public void ShowTreasures(bool _stepByStep)

        {

            crossServerModel.SortDayAwardsList();

            dayAwards = crossServerModel.sortDayAwardslist;

            dayAwards = crossServerModel.GetDayAwardsList();

            Init(dayAwards, _stepByStep);

        }



@@ -77,8 +76,7 @@
        void ReLocateItems()

        {

            showAchievementBehaviour.alphaTween.SetStartState();

            crossServerModel.SortDayAwardsList();

            dayAwards = crossServerModel.sortDayAwardslist;

            dayAwards = crossServerModel.GetDayAwardsList();

            ReLocateAllItems(showAchievementBehaviour);



            var endTime = DateTime.Now + new TimeSpan((long)(relocationTime * TimeSpan.TicksPerSecond));


 System/CrossServerOneVsOne/CrossServerOneVsOneDayAwardsWin.cs

@@ -47,8 +47,7 @@


        private void CreateCell()

        {

            crossServerModel.SortDayAwardsList();

            var dayAwards = crossServerModel.sortDayAwardslist;

            var dayAwards = crossServerModel.GetDayAwardsList();

            m_AchievementScroll.ShowTreasures(false);

        }

    }


 System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs

@@ -141,12 +141,10 @@
            }

        }



        public List<AwardType> sortDayAwardslist = new List<AwardType>();

        public void SortDayAwardsList()

        public List<AwardType> GetDayAwardsList()

        {

            sortDayAwardslist.Clear();

            sortDayAwardslist.AddRange(dayAwardTypelist);

            sortDayAwardslist.Sort(CompareByCompleteProgress);

            dayAwardTypelist.Sort(CompareByCompleteProgress);

            return dayAwardTypelist;

        }



        public int CompareByCompleteProgress(AwardType start,AwardType end)

@@ -155,8 +153,12 @@
            int y = (int)end.progress;

            if (x.CompareTo(y) != 0) return x.CompareTo(y);



            x = dayAwardTypelist.IndexOf(start);

            y = dayAwardTypelist.IndexOf(end);

            x = start.type;

            y = end.type;

            if (x.CompareTo(y) != 0) return x.CompareTo(y);



            x = start.num;

            y = end.num;

            if (x.CompareTo(y) != 0) return x.CompareTo(y);



            return 0;


 System/CrossServerOneVsOne/CrossServerOneVsOnePKSeason.cs

@@ -107,14 +107,6 @@
            MatchState = 0;

        }



        public List<HourMinute> GetActivityTimes()

        {

            DailyQuestOpenTime _openTime = null;

            dailyQuestModel.TryGetOpenTime(dailyQuestId, out _openTime);

            var dayOfWeek = (int)TimeUtility.ServerNow.DayOfWeek;

            return _openTime != null ? _openTime.GetHourMinuteByWeek(dayOfWeek) : null;

        }



        private void SecondEvent()

        {

            if(!inDateNotify && InPkSeason(TimeUtility.ServerNow))

@@ -246,6 +238,14 @@
           return _openTime != null && _openTime.InOpenTime() && MatchState == 1;

        }



        public List<HourMinute> GetActivityTimes()

        {

            DailyQuestOpenTime _openTime = null;

            dailyQuestModel.TryGetOpenTime(dailyQuestId, out _openTime);

            var dayOfWeek = (int)TimeUtility.ServerNow.DayOfWeek;

            return _openTime != null ? _openTime.GetHourMinuteByWeek(dayOfWeek) : null;

        }



        public int IndexOfDays(DateTime time)

        {

            if (!InPkSeason(time))


 System/CrossServerOneVsOne/CrossServerOneVsOnePlayerInfo.cs

@@ -87,7 +87,7 @@
        public string DisplayWinningRate()

        {

            float rate = PKCount != 0 ? (float)WinCount / PKCount : 0;

            return StringUtility.Contact((float)Math.Round(rate,1),"%");

            return StringUtility.Contact((float)Math.Round(rate,1)*100,"%");

        }



    }


 System/CrossServerOneVsOne/CrossSeverOneVsOneBuyMatchTimesWin.cs

@@ -75,14 +75,14 @@
                        {

                            if (isOk)

                            {

                                crossServerModel.SendBuyMatchCount();

                                SendBuyTimes();

                            }

                        });

                    return;

                }

                else

                {

                    crossServerModel.SendBuyMatchCount();

                    SendBuyTimes();

                }

            }

            else

@@ -91,5 +91,10 @@
            }

        }



        private void SendBuyTimes()

        {

            crossServerModel.SendBuyMatchCount();

            CloseImmediately();

        }

    }

}


 System/CrossServerOneVsOne/CrossSeverOneVsOneDayAwardCell.cs

@@ -50,8 +50,6 @@
        private void DisplayDayAward()

        {

            var awardItems = awardType.awardItems;

            stateImg.gameObject.SetActive(awardType.progress != CrossServerOneVsOneModel.AwardType.CompleteProgress.Completed);

            recieveBtn.gameObject.SetActive(awardType.progress == CrossServerOneVsOneModel.AwardType.CompleteProgress.Completed);

            progressSlider.minValue = 0;

            progressSlider.maxValue = awardType.num;

            progressSlider.value = awardType.curCompletedNum;

@@ -77,10 +75,24 @@
            switch(awardType.type)

            {

                case 1:

                    taskNameText.text = Language.Get("CrossServer116",awardType.curCompletedNum);

                    taskNameText.text = Language.Get("CrossServer116",awardType.num);

                    break;

                case 2:

                    taskNameText.text = Language.Get("CrossServer117", awardType.curCompletedNum);

                    taskNameText.text = Language.Get("CrossServer117", awardType.num);

                    break;

            }



            stateImg.gameObject.SetActive(awardType.progress != CrossServerOneVsOneModel.AwardType.CompleteProgress.Completed);

            recieveBtn.gameObject.SetActive(awardType.progress == CrossServerOneVsOneModel.AwardType.CompleteProgress.Completed);

            switch (awardType.progress)

            {

                case CrossServerOneVsOneModel.AwardType.CompleteProgress.Completed:

                    break;

                case CrossServerOneVsOneModel.AwardType.CompleteProgress.UnCompleted:

                    stateImg.SetSprite("LVReward2");

                    break;

                case CrossServerOneVsOneModel.AwardType.CompleteProgress.AlreadyReceived:

                    stateImg.SetSprite("LVReward1");

                    break;

            }

        }