| Core/Camera/CameraController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0608_tagNPCDie.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Core/NetworkPackage/DTCFile/ServerPack/HAD_SaleActivity.meta | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Core/NetworkPackage/DTCFile/ServerPack/HAE_Truck.meta | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Core/NetworkPackage/DTCFile/ServerPack/HAF_Merge.meta | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Core/NetworkPackage/DTCFile/ServerPack/HB0_Event.meta | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Core/NetworkPackage/ServerPack/HAD_SaleActivity.meta | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Core/NetworkPackage/ServerPack/HAE_Truck.meta | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Core/NetworkPackage/ServerPack/HAF_Merge.meta | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Core/NetworkPackage/ServerPack/HB0_Event.meta | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/GeneralConfig/GeneralDefine.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Utility/MathUtility.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Core/Camera/CameraController.cs
@@ -144,6 +144,36 @@ rotationX += _change_value; } public struct LookAtData { public Vector3 position; public float rotX; public float rotY; public float lastTime; } public void StartLookAtTarget(LookAtData data) { StopCoroutine("_CoLookAtTarget"); StartCoroutine("_CoLookAtTarget", data); } IEnumerator _CoLookAtTarget(LookAtData data) { GA_Hero.s_MapSwitching = true; SetLookTarget(null); transform.position = data.position; float _cacheRotX = rotationX; float _cacheRotY = rotationY; rotationX = data.rotX; rotationY = data.rotY; yield return new WaitForSeconds(data.lastTime); SetLookTarget(PlayerDatas.Instance.hero.Root); rotationX = _cacheRotX; rotationY = _cacheRotY; GA_Hero.s_MapSwitching = false; } IEnumerator CameraRotationX(float _angle) { while (rotationX != _angle) @@ -216,6 +246,7 @@ CameraObject.transform.localPosition = -Vector3.forward * Distance; } #if UNITY_EDITOR void OnDrawGizmos() { if (CameraObject != null) @@ -230,6 +261,7 @@ Gizmos.DrawLine(CameraObject.transform.position, transform.position); } } #endif private void OnDestroy() { Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0608_tagNPCDie.cs
@@ -44,10 +44,14 @@ { BossFakeLineUtility.Instance.RecordBossKillTime(_targetFight.NpcConfig.NPCID, System.DateTime.Now); } if (GeneralDefine.NpcDieSetCamera.ContainsKey(_targetFight.NpcConfig.NPCID)) { CameraController.Instance.StartLookAtTarget(GeneralDefine.NpcDieSetCamera[_targetFight.NpcConfig.NPCID]); } } _actor.SetAnimatorSpeed(1); GActorFight _actorFight = _actor as GActorFight; if (_actor is GActorNpcNoFight || !_actor.HasState(GAStaticDefine.State_DeadHash)) @@ -57,33 +61,33 @@ else if (_actor is GActorNpcFight || _actor is GA_NpcFightSgzcZZ) { if (_actorFight != null) if (_targetFight != null) { GA_Hero _hero = PlayerDatas.Instance.hero; if (_hero != null) { if (_hero.SelectTarget != null && _actorFight.ServerInstID == _hero.SelectTarget.ServerInstID) if (_hero.SelectTarget != null && _targetFight.ServerInstID == _hero.SelectTarget.ServerInstID) { SelectionManager.Release(SelectionManager.E_Type.Red); } if (_hero.LockTarget == _actorFight) if (_hero.LockTarget == _targetFight) { _hero.LockTarget = null; } } if (_actorFight.State == E_ActorState.AutoRun) if (_targetFight.State == E_ActorState.AutoRun) { _actorFight.StopPathFind(); _targetFight.StopPathFind(); } _actorFight.ActorInfo.serverDie = true; _actorFight.ReleaseName(); _actorFight.ReleaseShadow(); _actorFight.SkillMgr.Clear(); GAMgr.Instance.DoDelayDie(_actorFight); _targetFight.ActorInfo.serverDie = true; _targetFight.ReleaseName(); _targetFight.ReleaseShadow(); _targetFight.SkillMgr.Clear(); GAMgr.Instance.DoDelayDie(_targetFight); GActorFight _killer = GAMgr.Instance.GetBySID(vNetData.KillerID) as GActorFight; @@ -104,11 +108,11 @@ if (_transToMainUser) { _actorFight.Die(vNetData.KillerID / 10); _targetFight.Die(vNetData.KillerID / 10); } else { _actorFight.Die(vNetData.KillerID); _targetFight.Die(vNetData.KillerID); } } else @@ -124,17 +128,17 @@ _content = string.Format("DTC0608_tagNPCDie => {0} 死亡的时候凶手: {1} 已经将招式: {2} 演示完毕, 这里直接死亡.", vNetData.ObjID, vNetData.KillerID, vNetData.Reason); RuntimeLogUtility.AddLog_Red(_content, (uint)vNetData.ObjID); #endif _actorFight.Die(vNetData.KillerID); _targetFight.Die(vNetData.KillerID); } } else { _actorFight.Die(vNetData.KillerID); _targetFight.Die(vNetData.KillerID); } } else { _actorFight.Die(); _targetFight.Die(); } } } @@ -145,5 +149,7 @@ } GAMgr.Instance.ServerDie(vNetData.ObjID); } } Core/NetworkPackage/DTCFile/ServerPack/HAD_SaleActivity.meta
File was deleted Core/NetworkPackage/DTCFile/ServerPack/HAE_Truck.meta
File was deleted Core/NetworkPackage/DTCFile/ServerPack/HAF_Merge.meta
File was deleted Core/NetworkPackage/DTCFile/ServerPack/HB0_Event.meta
File was deleted Core/NetworkPackage/ServerPack/HAD_SaleActivity.meta
File was deleted Core/NetworkPackage/ServerPack/HAE_Truck.meta
File was deleted Core/NetworkPackage/ServerPack/HAF_Merge.meta
File was deleted Core/NetworkPackage/ServerPack/HB0_Event.meta
File was deleted System/GeneralConfig/GeneralDefine.cs
@@ -191,6 +191,7 @@ public static int mainWinTopCloseTime { get; private set; } public static List<int> equipDecomposeScreen = new List<int>(); public static Dictionary<int, float> AtkTypeIncreasePushDis = new Dictionary<int, float>(); public static Dictionary<int, CameraController.LookAtData> NpcDieSetCamera = new Dictionary<int, CameraController.LookAtData>(); public static void Init() { @@ -767,6 +768,25 @@ { AtkTypeIncreasePushDis[int.Parse(_ks[i])] = int.Parse(_vs[i]) * Constants.F_DELTA; } func = FuncConfigConfig.Get("NpcDieSetCamera"); if (func != null) { var _jsonData = LitJson.JsonMapper.ToObject(func.Numerical1); for (i = 0; i < _jsonData.Count; ++i) { var _child = _jsonData[i]; var _lookAtData = new CameraController.LookAtData(); _lookAtData.position = new Vector3(MathUtility.GetFloatFromLitJson(_child[1][0]), MathUtility.GetFloatFromLitJson(_child[1][1]), MathUtility.GetFloatFromLitJson(_child[1][2])); _lookAtData.rotX = (int)_child[2]; _lookAtData.rotY = (int)_child[3]; _lookAtData.lastTime = MathUtility.GetFloatFromLitJson(_child[4]); NpcDieSetCamera[(int)_child[0]] = _lookAtData; } } } catch (Exception ex) { Utility/MathUtility.cs
@@ -206,4 +206,16 @@ } } public static float GetFloatFromLitJson(LitJson.JsonData j) { if (j.IsDouble) { return (float)(double)j; } else if (j.IsInt) { return (float)(int)j; } return 0f; } }