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

client_Wu Xijin

2018-11-27 e6a321e18a9b06ed89e1704984f692710ef3d906

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

 Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0614_tagUseSkillPos.cs

@@ -30,13 +30,15 @@
                {

                    _attacker.SelectTarget = _mainTarget;

                }

                //if (_attacker is GA_NpcSummonFight)

                //    Debug.LogFormat("<color=blue>{0} 攻击 {1}, 伤害: {2}, 血量: {3}, 血量Ex: {4}</color>",

                //        vNetData.ObjID,

                //        vNetData.HurtList[0].ObjID,

                //        vNetData.HurtList[0].HurtHP,

                //        vNetData.HurtList[0].CurHP,

                //        vNetData.HurtList[0].CurHPEx);

                if (RuntimeLogUtility.s_ShowZZAtkValue && _attacker is GA_NpcFightZZPlayer)

                {

                    Debug.LogFormat("<color=yellow> 助战:{0} 攻击 NPC:{1}, 伤害: {2}, 剩余血量: {3}, 剩余血量Ex: {4}</color>",

                        vNetData.ObjID,

                        vNetData.HurtList[0].ObjID,

                        vNetData.HurtList[0].HurtHP,

                        vNetData.HurtList[0].CurHP,

                        vNetData.HurtList[0].CurHPEx);

                }

            }



            //if (_attacker is GA_NpcSummonFight)


 Fight/GameActor/GAStaticDefine.cs

@@ -292,7 +292,8 @@
         || target.ServerInstID == PlayerDatas.Instance.PlayerId// 或者受伤的人是自己    

         || (attackType == (int)HurtAttackType.Recovery

          && (target.ActorType == GameObjType.gotNPC

          || (PlayerDatas.Instance.hero != null && target == PlayerDatas.Instance.hero.SelectTarget))))// npc和当前选中目标的回血显示

          || (PlayerDatas.Instance.hero != null && target == PlayerDatas.Instance.hero.SelectTarget)))// npc和当前选中目标的回血显示

         ||(caster == null && target.ActorInfo.ownerSID == 0))

        {

            // 决定显示的类型

            int _base = (int)PopUpNum.Pattern.PlayerAttack;


 System/Chat/ChatCenter.cs

@@ -26,7 +26,7 @@
            WindowCenter.Instance.windowAfterOpenEvent += WindowAfterOpenEvent;

            StageManager.Instance.onStageLoadFinish += OnStageLoadFinish;

            PlayerRealmData.OnPlayerCollectEnd += OnPlayerCollectEnd;

            SnxxzGame.Instance.AddApplicationOutAction(OnApplicationQuit);

            //SnxxzGame.Instance.AddApplicationOutAction(OnApplicationQuit);



            var time = bandTime;

            banTimeArray[0] = time.Year;

@@ -198,10 +198,10 @@
            {

                LocalChatHistory.Read();

            }

            if (beforeDungeon && !isDungeon)

            {

                LocalChatHistory.Save();

            }

            //if (beforeDungeon && !isDungeon)

            //{

            //    LocalChatHistory.Save();

            //}

            beforeDungeon = isDungeon;

        }



@@ -1069,10 +1069,10 @@
        }

        #endregion



        private void OnApplicationQuit()

        {

            LocalChatHistory.Save();

        }

        //private void OnApplicationQuit()

        //{

        //    LocalChatHistory.Save();

        //}



    }

}


 System/Chat/LocalChatHistory.cs

@@ -44,8 +44,6 @@
                    }

                }

            }



            Clear();

        }



        static bool ExistAnyLocalChatHistory()

@@ -94,6 +92,7 @@
                    }

                    break;

            }

            Save();

        }



        static void Save(ChatInfoType type, string line)

@@ -261,6 +260,7 @@
            {

                chatHistory.Remove(type);

            }

            Save();

        }



        public static void Clear()


 System/Role/GodWeaponSkillBehaviour.cs

@@ -57,11 +57,7 @@
        {

            if (config != null)

            {

                string extra = string.Empty;

                if (PlayerDatas.Instance.skill.GetSKillById(config.SkillID) == null)

                {

                    extra = StringUtility.Contact("<color=#fa0101>", Language.Get("L1113", config.Name, config.Lv), "</color>");

                }

                string extra = StringUtility.Contact("<color=#fa0101>", Language.Get("L1113", config.Name, config.Lv), "</color>");

                var skillConfig = Config.Instance.Get<SkillConfig>(config.SkillID);

                SkillDetails.ShowSkillDetails(config.SkillID, SkillDetails.SkillSourceType.MagicianSkill,

                    skillConfig != null ? skillConfig.FightPower : 0, config.Name, extra);


 Utility/RuntimeLogUtility.cs

@@ -17,6 +17,7 @@
    public static bool s_LogMoveDistance = false;

    public static bool s_SkillEffectLog = false;

    public static bool s_ShowMapLine = false;

    public static bool s_ShowZZAtkValue = false;

    public static bool s_forceAutoFight

    {

        get

@@ -205,6 +206,7 @@
        RuntimeLogUtility.s_SkillEffectLog = EditorGUILayout.Toggle("技能效果log输出", RuntimeLogUtility.s_SkillEffectLog);

        RuntimeLogUtility.s_LogMoveDistance = EditorGUILayout.Toggle("位移距离Log输出", RuntimeLogUtility.s_LogMoveDistance);

        RuntimeLogUtility.s_ShowMapLine = EditorGUILayout.Toggle("显示地图网格", RuntimeLogUtility.s_ShowMapLine);

        RuntimeLogUtility.s_ShowZZAtkValue = EditorGUILayout.Toggle("显示助战伤害", RuntimeLogUtility.s_ShowZZAtkValue);



        _navChkPos = EditorGUILayout.Vector3Field("检测点", _navChkPos);