Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Hale

2018-12-28 d9d49b04ccb42ce2559a41f83c4d9289adf2bd27

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs

@@ -32,7 +32,7 @@
                _player.SwitchRealm((int)vNetData.Value);
            }
        }

        OpponentInformation.Instance.GetOpponentInformation0418(vNetData);//用于获取玩家护盾属性
        if (PlayerDatas.Instance.PlayerId == vNetData.ObjID)
        {
            PlayerDatas.Instance.RefreshPlayerData(vNetData);

 Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0434_tagAreaPlayerAppearEx.cs

@@ -1,5 +1,6 @@
using UnityEngine;

using System.Collections;

using Snxxz.UI;



//04 34 周围玩家出现合并封包#tagAreaPlayerAppearEx



@@ -24,7 +25,7 @@
        {

            // 异常

        }



        OpponentInformation.Instance.GetOpponentInformation0434(vNetData);//用于获取玩家护盾属性

        BattleEffectPlayRule.Instance.AddPlayer(vNetData.PlayerID);



        // 离线玩家


 Lua/Gen/SettingEffectMgrWrap.cs

@@ -21,15 +21,14 @@
        {
            ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            System.Type type = typeof(SettingEffectMgr);
            Utils.BeginObjectRegister(type, L, translator, 0, 3, 3, 2);
            Utils.BeginObjectRegister(type, L, translator, 0, 3, 2, 2);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "Begin", _m_Begin);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetSettingEffect", _m_GetSettingEffect);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "RefreshBagItem", _m_RefreshBagItem);
            
            
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "isPlayerDie", _g_get_isPlayerDie);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "isStartDecompose", _g_get_isStartDecompose);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "isStartDecompose", _g_get_isStartDecompose);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "isStartOneKeySell", _g_get_isStartOneKeySell);
            
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "isStartDecompose", _s_set_isStartDecompose);
@@ -163,20 +162,6 @@
        
        
        
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_isPlayerDie(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                SettingEffectMgr gen_to_be_invoked = (SettingEffectMgr)translator.FastGetCSObj(L, 1);
                LuaAPI.lua_pushboolean(L, gen_to_be_invoked.isPlayerDie);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_isStartDecompose(RealStatePtr L)

 Lua/Gen/SettingEffectMgrWrap.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: e64bf687f119c3549adf2cb6190dbe30
timeCreated: 1545203737
timeCreated: 1546002340
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs

@@ -199,6 +199,7 @@
                else

                {

                    matchBtn_Img.material = MaterialUtility.GetDefaultSpriteGrayMaterial();

                    matchBtn.AddListener(() => { SysNotifyMgr.Instance.ShowTip("CrossMatching20"); });

                }

            }

        }


 System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs

@@ -146,8 +146,7 @@


        private void UpdateFBHelp()

        {

           int dataMapId = dungeonModel.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);

            if (dataMapId != CrossServerDataMapId) return;

            if (PlayerDatas.Instance.baseData.ExAttr5 != 1) return;



            var mission = dungeonModel.mission;

            if(mission.prepareTime > 0)

@@ -377,8 +376,7 @@
        public bool TryGetMatchTip()

        {

            int mapId = PlayerDatas.Instance.baseData.MapID;

            int dataMapId = dungeonModel.GetDataMapIdByMapId(mapId);

            bool isCrossDungeon = dataMapId == CrossServerDataMapId;

            bool isCrossDungeon = PlayerDatas.Instance.baseData.ExAttr5 == 1;

            if(isCrossDungeon)

            {

                SysNotifyMgr.Instance.ShowTip("CrossMatching3");


 System/CrossServerOneVsOne/FightingPKWin.cs

@@ -100,6 +100,7 @@
            PlayerBuffDatas.Even_ObjAddBuf += AddBuff;

            PlayerBuffDatas.Even_ObjDelBuff += DelBuff;
            PlayerBuffDatas.BuffUpdateEvent += BuffUpdateEvent;
            OpponentInformation.Instance.ShieldUpdate += ShieldUpdate;
        }





@@ -114,10 +115,11 @@
            dungeonModel.updateMissionEvent -= UpdateMissionEvent;

            PlayerBuffDatas.Even_ObjAddBuf -= AddBuff;

            PlayerBuffDatas.Even_ObjDelBuff -= DelBuff;

            PlayerBuffDatas.BuffUpdateEvent -= BuffUpdateEvent;
            PlayerBuffDatas.BuffUpdateEvent -= BuffUpdateEvent;

            OpponentInformation.Instance.ShieldUpdate -= ShieldUpdate;
        }





      


        protected override void OnAfterClose()
        {
@@ -177,6 +179,8 @@
                OnCreateGridLineCel2(m_ScrollerController2);

            }

        }





        private void BuffUpdateEvent(int playerID)

        {

            int opponentPlayerId = CrossServerLogin.Instance.oneVsOnePlayerData.opponentPlayerId;

@@ -232,6 +236,11 @@
            }



        }



        private void ShieldUpdate(int playerID, int shieldNow)

        {

            DebugEx.LogError("输出玩家的ID" + playerID+"输出当前护盾值"+ shieldNow);

        }

        private void OnHeroHandupAIStopPassive()

        {

            //if (!m_AutoImg.activeSelf)


 System/CrossServerOneVsOne/OpponentInformation.cs

New file
@@ -0,0 +1,53 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [  Date ]:           Friday, December 28, 2018
//--------------------------------------------------------
using System;

using System.Collections.Generic;

using TableConfig;

using Snxxz.UI;

namespace Snxxz.UI

{
    [XLua.LuaCallCSharp]

    //对手信息
    public class OpponentInformation : Singleton<OpponentInformation>

    {

        public int PlayerID { get; private set; }     // 玩家ID

        public int ExAttr4 { get; private set; }    // 当前护盾值



        public event Action<int, int> ShieldUpdate;//玩家ID和护盾刷新



        public void GetOpponentInformation0418(H0418_tagObjInfoRefresh info)

        {



            switch ((PlayerDataRefresh)info.RefreshType)

            {

                case PlayerDataRefresh.ExAttr4:

                    this.PlayerID = (int)info.ObjID;

                    this.ExAttr4 = (int)info.Value;

                    if (ShieldUpdate != null)

                    {

                        ShieldUpdate((int)info.ObjID, (int)info.Value);

                    }

                    break;

                default:

                    break;

            }

        }

        public void GetOpponentInformation0434(H0434_tagAreaPlayerAppearEx info)

        {

            this.PlayerID = (int)info.PlayerID;

            this.ExAttr4 = (int)info.ExAttr4;

            if (ShieldUpdate != null)

            {

                ShieldUpdate((int)info.PlayerID, (int)info.ExAttr4);

            }

        }

    }

}




 System/CrossServerOneVsOne/OpponentInformation.cs.meta

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: b301ee999f03dff4ea3e6550c88b7f2b
timeCreated: 1545998954
licenseType: Free
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 System/SystemSetting/SettingEffectMgr.cs

@@ -51,8 +51,6 @@
    }

    DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }



    public bool isPlayerDie { get; private set; }



    private float delayTime = 2f;

    private bool isGetNewItem = false;

    public bool isStartDecompose { get; set; }

@@ -61,7 +59,6 @@
    private void Awake()

    {

        isGetNewItem = false;

        isPlayerDie = false;

        delayTime = 2;

        HeroBehaviour.OnStartHandupAI -= OnStartHandupAI;

        HeroBehaviour.OnStopHandupAI -= OnStopHandupAI;

@@ -102,7 +99,7 @@
        if(halfSecondTimer >= 0.5f)

        {

            halfSecondTimer = 0f;

            if (!isPlayerDie)

            if (!DeadModel.playerIsDie)

            {

                bool isCool;

                KnapsackTimeCDMgr.Instance.GetItemCoolByCDType(1, out isCool);

@@ -143,7 +140,6 @@


    private void PlayerRebornSuccess()

    {

        isPlayerDie = false;

        StopAllCoroutines();

    }



@@ -229,8 +225,7 @@
    /// </summary>

    private void AutoDrugSetting()

    {

        int dataMapId = dungeonModel.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);

        if (dataMapId == CrossServerOneVsOneModel.CrossServerDataMapId) return;

        if (PlayerDatas.Instance.baseData.ExAttr5 == 1) return;



        float hpPercent = Mathf.RoundToInt((float)PlayerDatas.Instance.baseData.HP / PlayerDatas.Instance.extersion.MaxHP * 100);

        if (hpPercent <= HangUpSetModel.Instance.GetHpSet())

@@ -273,13 +268,6 @@
    private int rebornPrice;

    private void OnPlayerDie()

    {

        if (WindowCenter.Instance.IsOpen<FunctionForecastWin>())

        {

            WindowCenter.Instance.Close<FunctionForecastWin>();

        }

        isPlayerDie = true;





        if (!_isAutoHangUp || !HangUpSetModel.Instance.GetBool(HangUpAutoBoolType.isAutoReborn)

            || !DeadModel.IsCanReborn || IsDungeon())

            return;


 System/WindowJump/WindowJumpMgr.cs

@@ -1206,7 +1206,7 @@
                        switch (window.name)

                        {

                            case "RebornWin":

                                if (SettingEffectMgr.Instance.isPlayerDie)

                                if (DeadModel.playerIsDie)

                                {

                                    if (!WindowCenter.Instance.IsOpen(openWinlist[i]))

                                    {

@@ -1215,7 +1215,7 @@
                                }

                                break;

                            case "ReliveWin":

                                if (SettingEffectMgr.Instance.isPlayerDie)

                                if (DeadModel.playerIsDie)

                                {

                                    if (!WindowCenter.Instance.IsOpen(openWinlist[i]))

                                    {

@@ -1224,7 +1224,7 @@
                                }

                                break;

                            case "ElderGodAreaExitWin":

                                if (SettingEffectMgr.Instance.isPlayerDie)

                                if (DeadModel.playerIsDie)

                                {

                                    if (!WindowCenter.Instance.IsOpen(openWinlist[i]))

                                    {