From 0ed1cf288b8a6cd657c4c83b82bcc9f71c435ab2 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 08 五月 2019 16:36:16 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/GeneralConfig/GeneralDefine.cs |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/System/GeneralConfig/GeneralDefine.cs b/System/GeneralConfig/GeneralDefine.cs
index d31907d..18ef738 100644
--- a/System/GeneralConfig/GeneralDefine.cs
+++ b/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)
         {

--
Gitblit v1.8.0