7795 【2.0.200】【开发】雷罚BOSS取消协助功能

client_linchunjie

2019-07-04 fc1260d41d2227f5d92aa6190ce099240c906f8f

7795 【2.0.200】【开发】雷罚BOSS取消协助功能

 Core/NetworkPackage/DTCFile/ServerPack/HB2_ActionMap/DTCB212_tagMCZhuXianBossCnt.cs

@@ -15,7 +15,6 @@
    {

        base.Done(vNetPack);

        var package = vNetPack as HB212_tagMCZhuXianBossCnt;

        ModelCenter.Instance.GetModel<JadeDynastyBossModel>().OnReceivePackage(package);

    }



}


 Lua/Gen/SnxxzUIJadeDynastyBossModelWrap.cs

@@ -30,7 +30,6 @@
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "UnInit", _m_UnInit);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "IsJadeDynastyBoss", _m_IsJadeDynastyBoss);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "IsBossUnLocked", _m_IsBossUnLocked);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "IsAssistState", _m_IsAssistState);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetJadeDynastyBosses", _m_GetJadeDynastyBosses);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetParticipantCount", _m_GetParticipantCount);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetLatestUnLockBoss", _m_GetLatestUnLockBoss);
@@ -40,16 +39,13 @@
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "TryGetBossLine", _m_TryGetBossLine);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "TryEnterDungeon", _m_TryEnterDungeon);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "DisplayErrorTip", _m_DisplayErrorTip);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnReceivePackage", _m_OnReceivePackage);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "selectBossRefresh", _e_selectBossRefresh);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "bossLineRefresh", _e_bossLineRefresh);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "assistTimeRefresh", _e_assistTimeRefresh);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "jadeDynastyScoreRefresh", _e_jadeDynastyScoreRefresh);
            
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "challengeLimitCount", _g_get_challengeLimitCount);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "challengeTimes", _g_get_challengeTimes);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "assistTimes", _g_get_assistTimes);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "selectBossId", _g_get_selectBossId);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "assginSelectBossId", _g_get_assginSelectBossId);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "redpoint", _g_get_redpoint);
@@ -293,34 +289,6 @@
                    
                    
                    return 2;
                }
                
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_IsAssistState(RealStatePtr L)
        {
            try {
            
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.JadeDynastyBossModel gen_to_be_invoked = (Snxxz.UI.JadeDynastyBossModel)translator.FastGetCSObj(L, 1);
            
            
                
                {
                    
                        bool gen_ret = gen_to_be_invoked.IsAssistState(  );
                        LuaAPI.lua_pushboolean(L, gen_ret);
                    
                    
                    
                    return 1;
                }
                
            } catch(System.Exception gen_e) {
@@ -599,48 +567,6 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_OnReceivePackage(RealStatePtr L)
        {
            try {
            
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.JadeDynastyBossModel gen_to_be_invoked = (Snxxz.UI.JadeDynastyBossModel)translator.FastGetCSObj(L, 1);
            
            
                int gen_param_count = LuaAPI.lua_gettop(L);
            
                if(gen_param_count == 2&& translator.Assignable<HA007_tagGCFBLinePlayerCnt>(L, 2)) 
                {
                    HA007_tagGCFBLinePlayerCnt _package = (HA007_tagGCFBLinePlayerCnt)translator.GetObject(L, 2, typeof(HA007_tagGCFBLinePlayerCnt));
                    
                    gen_to_be_invoked.OnReceivePackage( _package );
                    
                    
                    
                    return 0;
                }
                if(gen_param_count == 2&& translator.Assignable<HB212_tagMCZhuXianBossCnt>(L, 2)) 
                {
                    HB212_tagMCZhuXianBossCnt _package = (HB212_tagMCZhuXianBossCnt)translator.GetObject(L, 2, typeof(HB212_tagMCZhuXianBossCnt));
                    
                    gen_to_be_invoked.OnReceivePackage( _package );
                    
                    
                    
                    return 0;
                }
                
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            
            return LuaAPI.luaL_error(L, "invalid arguments to Snxxz.UI.JadeDynastyBossModel.OnReceivePackage!");
            
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_SortCompare_xlua_st_(RealStatePtr L)
        {
            try {
@@ -693,20 +619,6 @@
            
                Snxxz.UI.JadeDynastyBossModel gen_to_be_invoked = (Snxxz.UI.JadeDynastyBossModel)translator.FastGetCSObj(L, 1);
                LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.challengeTimes);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_assistTimes(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                Snxxz.UI.JadeDynastyBossModel gen_to_be_invoked = (Snxxz.UI.JadeDynastyBossModel)translator.FastGetCSObj(L, 1);
                LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.assistTimes);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
@@ -854,40 +766,6 @@
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            LuaAPI.luaL_error(L, "invalid arguments to Snxxz.UI.JadeDynastyBossModel.bossLineRefresh!");
            return 0;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _e_assistTimeRefresh(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                int gen_param_count = LuaAPI.lua_gettop(L);
            Snxxz.UI.JadeDynastyBossModel gen_to_be_invoked = (Snxxz.UI.JadeDynastyBossModel)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.assistTimeRefresh += gen_delegate;
                        return 0;
                    } 
					
					
                    if (LuaAPI.xlua_is_eq_str(L, 2, "-")) {
                        gen_to_be_invoked.assistTimeRefresh -= 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.JadeDynastyBossModel.assistTimeRefresh!");
            return 0;
        }
        

 System/Dungeon/DungeonRankBehaviour.cs

@@ -88,14 +88,7 @@
            switch (currentDugeonId)

            {

                case JadeDynastyBossModel.JADEDYNASTY_MAP:

                    if (jadeDynastyBossModel.IsAssistState())

                    {

                        mineValueText.text = string.Empty;

                    }

                    else

                    {

                        mineValueText.text = UIHelper.ReplaceLargeNum((ulong)hurt);

                    }

                    mineValueText.text = UIHelper.ReplaceLargeNum((ulong)hurt);

                    break;

                default:

                    if (mineRankText != null)

@@ -113,15 +106,7 @@


        private void DisplayAssistHurt()

        {

            if (jadeDynastyBossModel.IsAssistState())

            {

                mineRankText.text = Language.Get("JadeDynastyBossDungeon9");

                mineValueText.text = string.Empty;

            }

            else

            {

                mineRankText.text = Language.Get("DemonJar16");

            }

            mineRankText.text = Language.Get("DemonJar16");

        }



        private void SetDefault()


 System/JadeDynastyBoss/JadeDynastyBossModel.cs

@@ -20,12 +20,10 @@


        public event Action<int> selectBossRefresh;

        public event Action bossLineRefresh;

        public event Action assistTimeRefresh;

        public event Action jadeDynastyScoreRefresh;



        public int challengeLimitCount { get; private set; }

        public int challengeTimes { get; private set; }

        public int assistTimes { get; private set; }



        int m_SelectBossId = 0;

        public int selectBossId

@@ -66,7 +64,6 @@
        {

            jadeDynastyBossLineDict.Clear();

            challengeTimes = 0;

            assistTimes = 0;

        }



        public void OnAfterPlayerDataInitialize()

@@ -224,17 +221,6 @@
            return true;

        }



        public bool IsAssistState()

        {

            var totalTimes = dungeonModel.GetTotalTimes(JADEDYNASTY_MAP);

            var enterTimes = dungeonModel.GetEnterTimes(JADEDYNASTY_MAP);

            if (enterTimes >= totalTimes && assistTimes > 0)

            {

                return true;

            }

            return false;

        }



        public List<int> GetJadeDynastyBosses()

        {

            List<int> list = new List<int>();

@@ -378,7 +364,7 @@


            var totalTimes = dungeonModel.GetTotalTimes(JADEDYNASTY_MAP);

            var enterTimes = dungeonModel.GetEnterTimes(JADEDYNASTY_MAP);

            if (enterTimes >= totalTimes && assistTimes <= 0)

            if (enterTimes >= totalTimes)

            {

                error = 4;

                return false;

@@ -445,16 +431,6 @@
            {

                bossLineRefresh();

            }

        }



        public void OnReceivePackage(HB212_tagMCZhuXianBossCnt package)

        {

            assistTimes = package.Cnt;

            if (assistTimeRefresh != null)

            {

                assistTimeRefresh();

            }

            UpdateRedpoint();

        }



        public static int SortCompare(JadeDynastyBossData lhs, JadeDynastyBossData rhs)

@@ -528,7 +504,7 @@
                if (existAnyChallengeable)

                {

                    var count = dungeonModel.GetTotalTimes(JADEDYNASTY_MAP) - dungeonModel.GetEnterTimes(JADEDYNASTY_MAP);

                    redpoint.count = count + assistTimes;

                    redpoint.count = count;

                }

                else

                {


 System/JadeDynastyBoss/JadeDynastyBossWin.cs

@@ -19,7 +19,6 @@
        [SerializeField] NewDropItemTrigger m_NewDrop;

        [SerializeField] ItemCell[] m_Items;

        [SerializeField] Text m_ChallengeTimes;

        [SerializeField] Text m_AssistTimes;

        [SerializeField] Text m_JadeDynastyScore;

        [SerializeField] Button m_BuyTimes;

        [SerializeField] Transform m_SurpassLevel;

@@ -91,7 +90,6 @@
            findPreciousModel.bossSubscribeChangeEvent += DisplaySubscribe;

            findPreciousModel.bossInfoUpdateEvent += BossInfoUpdateEvent;

            model.bossLineRefresh += BossLineRefresh;

            model.assistTimeRefresh += AssistTimeRefresh;

            model.jadeDynastyScoreRefresh += JadeDynastyScoreRefresh;

        }



@@ -103,7 +101,6 @@
            findPreciousModel.bossSubscribeChangeEvent -= DisplaySubscribe;

            findPreciousModel.bossInfoUpdateEvent -= BossInfoUpdateEvent;

            model.bossLineRefresh -= BossLineRefresh;

            model.assistTimeRefresh -= AssistTimeRefresh;

            model.jadeDynastyScoreRefresh -= JadeDynastyScoreRefresh;



            refreshBossStateTime = -1f;

@@ -155,7 +152,6 @@
            DisplaySubscribe(model.selectBossId);

            DisplayKillRecord();

            DisplayBelongTo();

            DisplayAssistTimes();

            DisplayJadeDynastyScore();

        }



@@ -172,11 +168,6 @@
            var enterTimes = dungeonModel.GetEnterTimes(JadeDynastyBossModel.JADEDYNASTY_MAP);



            m_ChallengeTimes.text = StringUtility.Contact(totalTimes - enterTimes, "/", model.challengeLimitCount);

        }



        public void DisplayAssistTimes()

        {

            m_AssistTimes.text = model.assistTimes.ToString();

        }



        void DisplayDropItems()

@@ -306,11 +297,6 @@
        private void BossLineRefresh()

        {

            DisplayBelongTo();

        }



        private void AssistTimeRefresh()

        {

            DisplayAssistTimes();

        }



        private void ChallengeTimesRefresh()