少年修仙传客户端代码仓库
client_Wu Xijin
2019-05-08 0ed1cf288b8a6cd657c4c83b82bcc9f71c435ab2
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
8个文件已删除
11个文件已修改
6个文件已添加
534 ■■■■■ 已修改文件
Core/Camera/CameraController.cs 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/NetworkPackage/ClientPack/ClientToMapServer/CB2_NewFunction/CB207_tagCMResetAttrPoint.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/NetworkPackage/ClientPack/ClientToMapServer/CB2_NewFunction/CB207_tagCMResetAttrPoint.cs.meta 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0608_tagNPCDie.cs 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/NetworkPackage/DTCFile/ServerPack/HAD_SaleActivity.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/NetworkPackage/DTCFile/ServerPack/HAE_Truck.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/NetworkPackage/DTCFile/ServerPack/HAF_Merge.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/NetworkPackage/DTCFile/ServerPack/HB0_Event.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/NetworkPackage/ServerPack/HAD_SaleActivity.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/NetworkPackage/ServerPack/HAE_Truck.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/NetworkPackage/ServerPack/HAF_Merge.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/NetworkPackage/ServerPack/HB0_Event.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Alchemy/AlchemyDrugWin.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/GeneralConfig/GeneralDefine.cs 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/MainButtonMisc.cs 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Role/ReikiRootModel.cs 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Role/ReikiRootPointBehaviour.cs 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Role/ReikiRootRemindWin.cs 60 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Role/ReikiRootRemindWin.cs.meta 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Role/ReikiRootResetWin.cs 117 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Role/ReikiRootResetWin.cs.meta 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Role/ReikiRootWin.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Skill/TreasureSkillModel.cs 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Treasure/HumanTreasureWin.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Utility/MathUtility.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | 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/ClientPack/ClientToMapServer/CB2_NewFunction/CB207_tagCMResetAttrPoint.cs
New file
@@ -0,0 +1,16 @@
using UnityEngine;
using System.Collections;
// B2 07 重置加点 #tagCMResetAttrPoint
public class CB207_tagCMResetAttrPoint : GameNetPackBasic {
    public CB207_tagCMResetAttrPoint () {
        combineCmd = (ushort)0x03FE;
        _cmd = (ushort)0xB207;
    }
    public override void WriteToBytes () {
    }
}
Core/NetworkPackage/ClientPack/ClientToMapServer/CB2_NewFunction/CB207_tagCMResetAttrPoint.cs.meta
New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 8e02eb08daf502840b5a081f2a02c239
timeCreated: 1557300783
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData:
  assetBundleName:
  assetBundleVariant:
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/Alchemy/AlchemyDrugWin.cs
@@ -131,6 +131,11 @@
        {
            if (model.selectQuality != 0)
            {
                Int2 position;
                if (model.IsStoveAlcheming(m_AlchemyType, out position))
                {
                    return;
                }
                var alchemys = AlchemyConfig.GetAlchemies((int)m_AlchemyType, model.selectQuality);
                model.selectAlchemy = alchemys[0];
            }
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)
        {
System/MainInterfacePanel/MainButtonMisc.cs
@@ -5,6 +5,7 @@
using UnityEngine;
using System.Collections;
using UnityEngine.UI;
using System;
namespace Snxxz.UI
{
@@ -23,6 +24,7 @@
        [SerializeField] Button m_FlyToFairyGrabBoss;
        [SerializeField] Button m_FriendQuestBtn;
        [SerializeField] Button m_FairyRequestBtn;
        [SerializeField] Button m_ReikiResetRemind;
        FestivalRedpackModel festivalRedpackModel { get { return ModelCenter.Instance.GetModel<FestivalRedpackModel>(); } }
        OSRedEnvelopeModel OSEnvelopeModel { get { return ModelCenter.Instance.GetModel<OSRedEnvelopeModel>(); } }
@@ -33,6 +35,7 @@
        FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }
        FriendsModel friendsModel { get { return ModelCenter.Instance.GetModel<FriendsModel>(); } }
        FairyModel fairyModel { get { return ModelCenter.Instance.GetModel<FairyModel>(); } }
        ReikiRootModel reikiRootModel { get { return ModelCenter.Instance.GetModel<ReikiRootModel>(); } }
        private void Start()
        {
@@ -44,6 +47,7 @@
            m_GotoFairyGrabBoss.SetListener(GotoFairyGrabBoss);
            m_FlyToFairyGrabBoss.SetListener(FlyToFairyGrabBoss);
            m_FairyRequestBtn.SetListener(OnFairyRequestClick);
            m_ReikiResetRemind.SetListener(OnReikiRemind);
        }
        public void Init()
@@ -53,6 +57,7 @@
            CheckSendRedpackBtn();
            ShowFairyGrabBoss();
            IsCrossServerOneVsOne();
            DisplayReikiRemind();
            RedPacketModel.OnRedBagGetEvent += OnRedBagGet;
            OSEnvelopeModel.OSRedEnvelopeUpdateEvent += OnRedBagGet;
@@ -115,6 +120,7 @@
                m_DungeonAssistImg.gameObject.SetActive(false);
                m_FriendQuestBtn.gameObject.SetActive(false);
                m_FairyRequestBtn.gameObject.SetActive(false);
                m_ReikiResetRemind.gameObject.SetActive(false);
            }
            else
            {
@@ -124,6 +130,7 @@
                UpdateDungeonAssistImag();
                FriendQuestBtn();
                UpdateFairyRequest();
                DisplayReikiRemind();
            }
        }//再跨服状态的开关显隐控制
@@ -381,6 +388,12 @@
                m_FriendQuestBtn.gameObject.SetActive(false);
            }
        }
        void DisplayReikiRemind()
        {
            m_ReikiResetRemind.gameObject.SetActive(reikiRootModel.resetReikiRemind);
        }
        private void OnClickFriendQuest()
        {
            WindowCenter.Instance.Open<FriendQuestWin>();
@@ -389,6 +402,12 @@
        {
            WindowCenter.Instance.Open<FairyInviteWin>();
        }
        private void OnReikiRemind()
        {
            WindowCenter.Instance.Open<ReikiRootRemindWin>();
        }
        private void UpdateFairyRequest()
        {
            m_FairyRequestBtn.gameObject.SetActive(fairyModel.FairyRequestRedPoint.count > 0);
System/Role/ReikiRootModel.cs
@@ -44,6 +44,10 @@
        public int redpointRequirePoint { get; private set; }
        public int freeResetLevel { get; private set; }
        public int resetCostItemId { get; private set; }
        public bool isServerPrepare { get; private set; }
        public bool displayOpenAnimation
@@ -58,6 +62,9 @@
            }
        }
        public bool resetReikiRootRecord { get; set; }
        public bool resetReikiRemind { get; set; }
        public readonly Redpoint redpoint = new Redpoint(101, 10103);
        public event Action onCacheFreePointRefresh;
@@ -69,6 +76,7 @@
            PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefreshEvent;
            FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
            StageLoad.Instance.onStageLoadFinish += OnStageLoadFinish;
        }
        public void OnBeforePlayerDataInitialize()
@@ -76,6 +84,7 @@
            m_ReikiRootPoints.Clear();
            m_ReikiRootFreePoints.Clear();
            isServerPrepare = false;
            resetReikiRootRecord = false;
        }
        public void OnPlayerLoginOk()
@@ -88,6 +97,7 @@
        {
            PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefreshEvent;
            FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;
            StageLoad.Instance.onStageLoadFinish -= OnStageLoadFinish;
        }
        void ParseConfig()
@@ -102,6 +112,10 @@
            m_ReikiQualityMapColors = ConfigParse.GetDic<int, int>(funcConfig.Numerical2);
            redpointRequirePoint = int.Parse(funcConfig.Numerical3);
            funcConfig = FuncConfigConfig.Get("LVUPAddPoint");
            freeResetLevel = int.Parse(funcConfig.Numerical4);
            resetCostItemId = int.Parse(funcConfig.Numerical5);
            var config = ReikiRootConfig.GetValues()[0];
            maxQuality = config.qualityArea.Length;
@@ -123,6 +137,14 @@
                    m_PromotePropertyValues[_config.id].Add(job,
                        LitJson.JsonMapper.ToObject<int[]>(_json[_jobKey].ToJson()));
                }
            }
        }
        private void OnStageLoadFinish()
        {
            if (!(StageLoad.Instance.currentStage is DungeonStage))
            {
                resetReikiRemind = false;
            }
        }
@@ -180,6 +202,18 @@
            return m_CacheReikiRootPoints.ContainsKey(id) ? m_CacheReikiRootPoints[id] : 0;
        }
        public bool ExistAnyWashPoint()
        {
            foreach (var point in m_ReikiRootFreePoints.Values)
            {
                if (point > 0)
                {
                    return true;
                }
            }
            return false;
        }
        public List<ReikiRootRecommend> GetReikiRootRecommendPoint(int point)
        {
            if (point == 0)
System/Role/ReikiRootPointBehaviour.cs
@@ -7,10 +7,13 @@
{
    public class ReikiRootPointBehaviour : MonoBehaviour
    {
        [SerializeField] Text m_PropertyName;
        [SerializeField] Image m_Icon;
        [SerializeField] Text m_Quality;
        [SerializeField] Text m_Point;
        [SerializeField] Button m_Add;
        [SerializeField] Button m_Sub;
        [SerializeField] Button m_Max;
        [SerializeField] Text m_MaxLabel;
        [SerializeField] Button m_OpenKeyboard;
        public int id { get; private set; }
@@ -56,6 +59,7 @@
            UIEventTrigger.Get(m_Sub.gameObject).OnUp = OnSubUp;
            UIEventTrigger.Get(m_Add.gameObject).OnDown = OnAddDown;
            UIEventTrigger.Get(m_Add.gameObject).OnUp = OnAddUp;
            m_Max.AddListener(OnMax);
            m_OpenKeyboard.AddListener(OpenKeyboard);
        }
@@ -66,9 +70,12 @@
            cacheQuality = 0;
            m_Icon.SetSprite("XT_LG_" + id);
            DisplayPoint();
            model.onReikiRootPointRefresh += OnReikiRootPointRefresh;
            PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefreshEvent;
        }
        void DisplayPoint()
@@ -89,10 +96,17 @@
            if (cacheQuality != quality)
            {
                var propertyConfig = PlayerPropertyConfig.Get(id);
                m_PropertyName.text = StringUtility.Contact(propertyConfig.Name, ReikiRootModel.GetQualityLabel(quality));
                m_PropertyName.color = UIHelper.GetUIColor(model.GetQualityColor(quality), true);
                m_Quality.text = ReikiRootModel.GetQualityLabel(quality);
                m_Quality.color = UIHelper.GetUIColor(model.GetQualityColor(quality), true);
                cacheQuality = quality;
            }
        }
        void DisplayButtonState()
        {
            m_Add.SetInteractable(null, model.freePoint > 0);
            m_Sub.SetInteractable(null, model.freePoint > 0);
            m_Max.SetInteractable(m_MaxLabel, model.freePoint > 0);
        }
        private void OnAddDown(GameObject go)
@@ -125,6 +139,12 @@
        private void OnSubUp(GameObject go)
        {
            isPointSub = false;
        }
        private void OnMax()
        {
            point = model.cacheFreePoint;
            model.cacheFreePoint = 0;
        }
        IEnumerator Co_PointRefresh(bool pointUp)
@@ -173,9 +193,18 @@
            }
        }
        private void PlayerDataRefreshEvent(PlayerDataType dataType)
        {
            if (dataType == PlayerDataType.FreePoint)
            {
                DisplayButtonState();
            }
        }
        public void Dispose()
        {
            model.onReikiRootPointRefresh -= OnReikiRootPointRefresh;
            PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefreshEvent;
            if (m_Coroutine != null)
            {
System/Role/ReikiRootRemindWin.cs
New file
@@ -0,0 +1,60 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [  Date ]:           Wednesday, May 08, 2019
//--------------------------------------------------------
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
namespace Snxxz.UI
{
    public class ReikiRootRemindWin : Window
    {
        [SerializeField] Button m_Goto;
        [SerializeField] Button m_Close;
        #region Built-in
        protected override void BindController()
        {
        }
        protected override void AddListeners()
        {
            m_Goto.AddListener(Goto);
            m_Close.AddListener(CloseClick);
        }
        protected override void OnPreOpen()
        {
            ModelCenter.Instance.GetModel<ReikiRootModel>().resetReikiRemind = false;
        }
        protected override void OnAfterOpen()
        {
        }
        protected override void OnPreClose()
        {
        }
        protected override void OnAfterClose()
        {
        }
        #endregion
        private void Goto()
        {
            CloseImmediately();
            WindowCenter.Instance.Open<SkillWin>(false, 1);
        }
    }
}
System/Role/ReikiRootRemindWin.cs.meta
New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: a9d58215535de474da9f3c66b5cdf0bc
timeCreated: 1557303137
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData:
  assetBundleName:
  assetBundleVariant:
System/Role/ReikiRootResetWin.cs
New file
@@ -0,0 +1,117 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [  Date ]:           Wednesday, May 08, 2019
//--------------------------------------------------------
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
namespace Snxxz.UI
{
    public class ReikiRootResetWin : Window
    {
        [SerializeField] Transform m_ContainerFree;
        [SerializeField] Text m_FreeRemind;
        [SerializeField] Transform m_ContainerCost;
        [SerializeField] ItemBehaviour m_Item;
        [SerializeField] Button m_Reset;
        [SerializeField] Button m_Close;
        bool freeReset = false;
        ReikiRootModel model { get { return ModelCenter.Instance.GetModel<ReikiRootModel>(); } }
        PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
        #region Built-in
        protected override void BindController()
        {
        }
        protected override void AddListeners()
        {
            m_Reset.AddListener(OnReset);
            m_Close.AddListener(CloseClick);
        }
        protected override void OnPreOpen()
        {
            freeReset = PlayerDatas.Instance.baseData.LV < model.freeResetLevel;
            Display();
            PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefreshEvent;
        }
        protected override void OnAfterOpen()
        {
        }
        protected override void OnPreClose()
        {
            PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefreshEvent;
        }
        protected override void OnAfterClose()
        {
        }
        #endregion
        void Display()
        {
            m_ContainerFree.gameObject.SetActive(freeReset);
            m_ContainerCost.gameObject.SetActive(!freeReset);
            m_FreeRemind.gameObject.SetActive(freeReset);
            m_FreeRemind.text = string.Format("{0}级前免费", model.freeResetLevel);
            if (!freeReset)
            {
                m_Item.SetItem(model.resetCostItemId, 1);
            }
        }
        private void PlayerDataRefreshEvent(PlayerDataType dataType)
        {
            if (dataType == PlayerDataType.LV)
            {
                if (PlayerDatas.Instance.baseData.LV >= model.freeResetLevel && freeReset)
                {
                    freeReset = false;
                    Display();
                }
            }
        }
        private void OnReset()
        {
            if (freeReset)
            {
                var pak = new CB207_tagCMResetAttrPoint();
                GameNetSystem.Instance.SendInfo(pak);
                model.resetReikiRootRecord = true;
                CloseImmediately();
            }
            else
            {
                var count = packModel.GetItemCountByID(PackType.Item, model.resetCostItemId);
                if (count < 1)
                {
                    ItemTipUtility.Show(model.resetCostItemId);
                    return;
                }
                var pak = new CB207_tagCMResetAttrPoint();
                GameNetSystem.Instance.SendInfo(pak);
                model.resetReikiRootRecord = true;
                CloseImmediately();
            }
        }
    }
}
System/Role/ReikiRootResetWin.cs.meta
New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: a0f8f879e62e7924d952eb5aebf3a3a3
timeCreated: 1557300188
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData:
  assetBundleName:
  assetBundleVariant:
System/Role/ReikiRootWin.cs
@@ -19,7 +19,7 @@
        [SerializeField] RectTransform m_Container;
        [SerializeField] NumKeyBoard m_NumKeyboard;
        [SerializeField] Text m_FreePoint;
        [SerializeField] Button m_Recommend;
        [SerializeField] Button m_Reset;
        [SerializeField] Button m_Confirm;
        [SerializeField] Button m_Rule;
@@ -42,7 +42,7 @@
        protected override void AddListeners()
        {
            m_Recommend.AddListener(OnRecommend);
            m_Reset.AddListener(OnReset);
            m_Confirm.AddListener(Confirm);
            m_Rule.AddListener(OnRule);
@@ -200,6 +200,16 @@
            m_NumKeyboard.Value = num.ToString();
        }
        private void OnReset()
        {
            if (!model.ExistAnyWashPoint())
            {
                SysNotifyMgr.Instance.ShowTip("NoneReikiPointCanWash");
                return;
            }
            WindowCenter.Instance.Open<ReikiRootResetWin>();
        }
        private void OnRecommend()
        {
            var recommends = model.GetReikiRootRecommendPoint(model.freePoint);
System/Skill/TreasureSkillModel.cs
@@ -41,6 +41,7 @@
        public static int redpointIndex = 100;
        PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
        ReikiRootModel reikiRootModel { get { return ModelCenter.Instance.GetModel<ReikiRootModel>(); } }
        public event Action selectRefresh;
        public event Action<int> treasureSkillRefresh;
@@ -271,6 +272,8 @@
        public void OnReceivePackage(HA309_tagMCSkillElementInfo package)
        {
            var resetReikiRemind = false;
            for (int i = 0; i < package.Cnt; i++)
            {
                var data = package.InfoList[i];
@@ -278,12 +281,22 @@
                for (int j = 0; j < data.SkillCnt; j++)
                {
                    var lastLevel = m_ExpertActiveLevels.ContainsKey((int)data.ActiveSkill[j].SkillID) ?
                        m_ExpertActiveLevels[(int)data.ActiveSkill[j].SkillID] : 0;
                    m_ExpertActiveLevels[(int)data.ActiveSkill[j].SkillID] = data.ActiveSkill[j].ActiveLV;
                    if (serverInited)
                    {
                        if (expertActiveRefresh != null)
                        {
                            expertActiveRefresh((int)data.ActiveSkill[j].SkillID);
                        }
                        if (!resetReikiRemind)
                        {
                            if (data.ActiveSkill[j].ActiveLV < lastLevel && reikiRootModel.resetReikiRootRecord)
                            {
                                resetReikiRemind = true;
                            }
                        }
                    }
                }
@@ -292,6 +305,14 @@
            {
                expertSkillRefresh();
            }
            if (resetReikiRemind)
            {
                reikiRootModel.resetReikiRemind = true;
            }
            reikiRootModel.resetReikiRootRecord = false;
            UpdateRedpoint();
        }
System/Treasure/HumanTreasureWin.cs
@@ -27,6 +27,7 @@
        [SerializeField] Image m_SkillIcon;
        [SerializeField] Text m_SkillName;
        [SerializeField] Button m_Challenge;
        [SerializeField] Transform m_ContainerCondition;
        [SerializeField] Text m_ChallengeCondition;
        [SerializeField] Text m_TaskClueTitle;
        [SerializeField] Slider m_TaskSlider;
@@ -148,7 +149,7 @@
                var satisfyChallenge = model.SatisfyChallenge(model.selectedTreasure);
                m_Challenge.gameObject.SetActive(satisfyChallenge);
                m_ChallengeCondition.gameObject.SetActive(!satisfyChallenge && treasure.state != TreasureState.Collected);
                m_ContainerCondition.gameObject.SetActive(!satisfyChallenge && treasure.state != TreasureState.Collected);
                var progress = 1f;
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;
    }
}