少年修仙传客户端代码仓库
client_Hale
2019-01-24 484a707df440209770b9077471ee852f037e4ea6
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
1个文件已删除
56个文件已修改
4个文件已添加
3145 ■■■■ 已修改文件
Core/GameEngine/Login/Launch.cs 97 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/Config/EquipGSParamConfig.cs 58 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/Config/EquipGSParamConfig.cs.meta 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/Config/JadeDynastyBossConfig.cs 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/Config/JadeDynastyBossConfig.cs.meta 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/Config/JadeDynastyTowerConfig.cs 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/Config/JadeDynastyTowerConfig.cs.meta 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/Config/SkillFrameAnimationConfig.cs 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/Config/SkillFrameAnimationConfig.cs.meta 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/TelPartialConfig/tagEquipGSParamConfig.cs 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0403_tagPlayerLoginLoadOK.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lua/Gen/DebugUtilityWrap.cs.meta 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lua/Gen/DelegatesGensBridge.cs 842 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lua/Gen/Resources.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lua/Gen/ServerListCenterWrap.cs 60 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lua/Gen/SnxxzUIJadeDynastyBossModelWrap.cs 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lua/Gen/SnxxzUIJadeDynastySkillModelWrap.cs 483 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lua/Gen/SnxxzUIJadeDynastySkillModelWrap.cs.meta 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lua/Gen/SnxxzUIRankModelWrap.cs 90 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lua/Gen/XLuaGenAutoRegister.cs 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lua/Gen/link.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Compose/New/ComposeEquipWin.cs 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Compose/New/ComposeMatCell.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Compose/New/ComposeTicketWin.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Compose/New/ComposeToolsWin.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Compose/New/ComposeWinModel.cs 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Compose/New/ComposeWingsWin.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Compose/New/SelectEquipModel.cs 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/DogzDungeon/DogzDungeonModel.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Dungeon/DungeonFightWin.cs 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/FriendSystem/MailPanel.cs 126 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/GeneralConfig/GeneralDefine.cs 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyBoss/JadeDynastyBossModel.cs 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyBoss/JadeDynastyBossVictoryWin.cs 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyKnapSack/JadeDynastyDecomposeLineBeh.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyKnapSack/JadeDynastyDecomposeModel.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyKnapSack/JadeDynastyEquipBeh.cs 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyKnapSack/JadeDynastyEquipGetPathsWin.cs 154 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyKnapSack/JadeDynastyEquipGetPathsWin.cs.meta 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyKnapSack/JadeDynastyEquipModel.cs 102 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyKnapSack/JadeDynastyEquipWin.cs 42 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyKnapSack/JadeDynastyItemBeh.cs 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastySkill/JadeDynastySkillWin.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyTower/JadeDynastyTowerHintWin.cs 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyTower/JadeDynastyTowerModel.cs 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyTower/JadeDynastyTowerRankBehaviour.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyTower/JadeDynastyTowerRewardBehaviour.cs 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyTower/JadeDynastyTowerWin.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyTower/JadyDynastyTowerVictoryWin.cs 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/BetterItemGetBehaviour.cs 77 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/EquipTip.cs 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/ItemTipsModel.cs 118 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/PackModelInterface.cs 142 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/PackSendQuestMgr.cs 55 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/New/FairyWearWin.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/New/SplitWin.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Launch/LaunchWin.cs 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Realm/RealmPropertyUpWin.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/WindowJump/WindowJumpMgr.cs 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Utility/EnumHelper.cs 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Utility/StageLoadTimeOutCatcher.cs 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Login/Launch.cs
@@ -11,6 +11,7 @@
{
    static LaunchStage m_CurrentStage = LaunchStage.None;
    static int step = 0;
    public static ProgressInfo progressInfo { get; private set; }
    private void Awake()
@@ -123,18 +124,12 @@
    }
    float timer = 0f;
    float progressRateOfIncrease = 1f;
    float originalExpectTotalTime = -1f;
    float expectTotalTime = 0f;
    public float totalTime {
        get {
            return Mathf.Lerp(originalExpectTotalTime, expectTotalTime, Mathf.Clamp01(timer / expectTotalTime));
        }
    }
    Queue<LaunchTask> tasks = new Queue<LaunchTask>();
    LaunchTask currentTask = null;
    bool launchComplete = false;
    float surplusProgress = 0f;
    float surplusTime = 0f;
    void Start()
    {
@@ -182,7 +177,6 @@
        tasks.Enqueue(launchFadeOutTask);
        CalculateExpectTotalTime();
        originalExpectTotalTime = expectTotalTime;
    }
    void Update()
@@ -216,12 +210,13 @@
            if (m_CurrentStage == LaunchStage.DownLoad)
            {
                progressInfo = new ProgressInfo(m_CurrentStage, progressInfo.totalProgress, 0f);
                progressInfo = new ProgressInfo(m_CurrentStage, 1, progressInfo.totalProgress, 0f);
            }
            else
            {
                timer += Time.deltaTime;
                var progress = progressInfo.totalProgress + progressRateOfIncrease * Time.deltaTime / totalTime;
                var progress = progressInfo.totalProgress + surplusProgress * (Time.deltaTime / surplusTime);
                progress = Mathf.Clamp(progress, 0, 0.98f);
                var partProgress = 0f;
                if (currentTask == null)
@@ -230,18 +225,19 @@
                }
                else
                {
                    var temp = currentTask.timer / Mathf.Min(1f, currentTask.duration);
                    var temp = currentTask.timer / Mathf.Min(2f, currentTask.duration);
                    step = (int)temp + 1;
                    partProgress = temp - (int)temp;
                }
                progressInfo = new ProgressInfo(m_CurrentStage, Mathf.Clamp01(progress), partProgress);
                progressInfo = new ProgressInfo(m_CurrentStage, step, Mathf.Clamp01(progress), partProgress);
            }
        }
        if (launchComplete)
        {
            Debug.LogFormat("启动耗时:{0}", timer);
            progressInfo = new ProgressInfo(m_CurrentStage, 1f, 1f);
            progressInfo = new ProgressInfo(m_CurrentStage, 1, 1f, 1f);
            this.enabled = false;
            StageManager.Instance.LoadLoginStage();
        }
@@ -249,19 +245,13 @@
    void CalculateExpectTotalTime()
    {
        var time = timer;
        foreach (var item in tasks)
        {
            time += item.expectTime;
        surplusTime = 0f;
        foreach (var item in tasks)
        {
            surplusTime += item.expectTime;
        }
        expectTotalTime = time;
        if (originalExpectTotalTime <= 0f)
        {
            originalExpectTotalTime = expectTotalTime;
        }
        progressRateOfIncrease = (expectTotalTime - timer) / (originalExpectTotalTime - timer);
        surplusProgress = 1 - progressInfo.totalProgress;
    }
    public enum LaunchStage
@@ -330,7 +320,6 @@
            var memory = 2048;
            DeviceUtility.GetCpuAndMemory(out cpu, out memory);
            DebugEx.LogFormat("获得机器信息:cpu {0}----内存 {1}", cpu, memory);
            GameNotice.OpenGameNotice();
        }
        public override void Update()
@@ -362,14 +351,14 @@
        List<FileInfo> copyTasks = new List<FileInfo>();
        public override float expectTime {
            get { return LocalSave.GetFloat("AssetCopyTask_ExpectTime", 30f); }
            get { return LocalSave.GetFloat("AssetCopyTask_ExpectTime", 70f); }
            protected set { LocalSave.SetFloat("AssetCopyTask_ExpectTime", value); }
        }
        public override void Begin()
        {
            m_CurrentStage = LaunchStage.AssetCopy;
            duration = Mathf.Max(0.1f, expectTime);
            duration = Mathf.Max(0.5f, expectTime);
            outTime = 50f;
#if UNITY_ANDROID
            switch (VersionConfig.Get().assetAccess)
@@ -523,7 +512,7 @@
        public override void Begin()
        {
            m_CurrentStage = LaunchStage.AssetCopy;
            duration = Mathf.Max(0.1f, expectTime);
            duration = Mathf.Max(0.5f, expectTime);
            if (!AssetDeCompressTask.assetDeCompressCompleted)
            {
@@ -573,7 +562,7 @@
        public override void Begin()
        {
            m_CurrentStage = LaunchStage.ClientVersion;
            duration = expectTime;
            duration = Mathf.Max(0.5f, expectTime);
#if UNITY_ANDROID
            if (InGameDownTestUtility.enable || !Application.isEditor)
@@ -640,7 +629,7 @@
        public override void Begin()
        {
            m_CurrentStage = LaunchStage.CheckAsset;
            duration = Mathf.Max(0.1f, expectTime);
            duration = Mathf.Max(0.5f, expectTime);
            ServerListCenter.Instance.RequestJumpUrl();
            OperationLogCollect.Instance.RecordLauchEvent(2);
@@ -662,6 +651,7 @@
        {
            expectTime = timer;
            DebugEx.LogFormat("{0}执行时长:{1};", this.GetType().Name, timer);
            GameNotice.OpenGameNotice();
        }
        public override void Update()
@@ -697,7 +687,7 @@
        {
            m_CurrentStage = LaunchStage.DownLoad;
            duration = Mathf.Max(0.1f, expectTime);
            duration = Mathf.Max(0.5f, expectTime);
            if (VersionUtility.Instance.NeedDownAsset())
            {
                if (!AssetVersionUtility.priorAssetDownLoadDone)
@@ -762,7 +752,7 @@
        {
            m_CurrentStage = LaunchStage.AssetBundleInit;
            duration = Mathf.Max(0.1f, expectTime);
            duration = Mathf.Max(0.5f, expectTime);
            if (!AssetSource.allFromEditor)
            {
                AssetBundleUtility.Instance.Sync_LoadAll("ui/prioritywindow");
@@ -780,6 +770,7 @@
        public override void End()
        {
            expectTime = timer;
            UILoader.LoadWindowAsync("LaunchBackGroundWin", null);
            DebugEx.LogFormat("{0}执行时长:{1};", this.GetType().Name, timer);
        }
@@ -807,19 +798,16 @@
    public class ConfigInitTask : LaunchTask
    {
        public override float expectTime {
            get { return LocalSave.GetFloat("ConfigInitTask_ExpectTime", inferredTime); }
            get { return LocalSave.GetFloat("ConfigInitTask_ExpectTime", 10f); }
            protected set { LocalSave.SetFloat("ConfigInitTask_ExpectTime", value); }
        }
        float threshold = 1f;
        float inferredTime = 3f;
        public override void Begin()
        {
            inferredTime = LocalSave.GetFloat("AssetCopyTask_ExpectTime", 30f) / 30f * 10f;
            m_CurrentStage = LaunchStage.ConfigInit;
            duration = Mathf.Max(0.1f, expectTime);
            duration = Mathf.Max(0.5f, expectTime);
            threshold = Application.platform == RuntimePlatform.WindowsEditor ? 1f : 0.9f;
            LaunchPostProcess.Instance.Begin();
@@ -863,44 +851,28 @@
            protected set { LocalSave.SetFloat("LaunchFadeOutTask_ExpectTime", value); }
        }
        bool launchBackGroundLoadedOk = false;
        bool openBackGround = false;
        public override void Begin()
        {
            m_CurrentStage = LaunchStage.Complete;
            duration = Mathf.Max(0.1f, expectTime);
            duration = Mathf.Max(0.5f, expectTime);
            LuaUtility.Instance.Init();
            CSharpCallLua.Init();
            ShaderUtility.WarmUpAll();
            SpeechTranslate.Instance.RequestGetToken();
            UI3DModelExhibition.CreateStage();
            WindowCenter.Instance.Open<LaunchBackGroundWin>(true);
            var launchWin = WindowCenter.Instance.Get<LaunchWin>();
            if (launchWin != null)
            {
                launchWin.FadeOut();
            }
            UILoader.LoadWindowAsync("LaunchBackGroundWin",
                (bool ok, UnityEngine.Object @object) =>
                {
                    if (ok)
                    {
                        launchBackGroundLoadedOk = true;
                    }
                });
        }
        public override void End()
        {
            expectTime = timer;
            DebugEx.LogFormat("{0}执行时长:{1};", this.GetType().Name, timer);
            if (!openBackGround)
            {
                WindowCenter.Instance.Open<LaunchBackGroundWin>(true);
            }
            var launchBackGroundWin = WindowCenter.Instance.Get<LaunchBackGroundWin>();
            launchBackGroundWin.transform.SetAsFirstSibling();
@@ -913,15 +885,6 @@
                return;
            }
            timer += Time.deltaTime;
            if (!openBackGround)
            {
                if (launchBackGroundLoadedOk)
                {
                    WindowCenter.Instance.Open<LaunchBackGroundWin>();
                    openBackGround = true;
                }
            }
            if (timer >= expectTime)
            {
@@ -973,12 +936,14 @@
    public struct ProgressInfo
    {
        public LaunchStage stage;
        public int step;
        public float totalProgress;
        public float partProgress;
        public ProgressInfo(LaunchStage stage, float totalProgress, float partProgress)
        public ProgressInfo(LaunchStage stage, int step, float totalProgress, float partProgress)
        {
            this.stage = stage;
            this.step = step;
            this.totalProgress = totalProgress;
            this.partProgress = partProgress;
        }
Core/GameEngine/Model/Config/EquipGSParamConfig.cs
@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Tuesday, January 22, 2019
//    [  Date ]:           Thursday, January 24, 2019
//--------------------------------------------------------
using UnityEngine;
@@ -40,20 +40,20 @@
        public int SkillAtkRateReduceC { get ; private set ; }
        public int HitC { get ; private set ; }
        public int MissC { get ; private set ; }
        public int SkillAddPer1C { get ; private set ; }
        public int SkillAddPer2C { get ; private set ; }
        public int SkillAddPer3C { get ; private set ; }
        public int SkillAddPer4C { get ; private set ; }
        public int SkillAddPer5C { get ; private set ; }
        public int SkillAddPer6C { get ; private set ; }
        public int SkillAddPer7C { get ; private set ; }
        public int SkillReducePer1C { get ; private set ; }
        public int SkillReducePer2C { get ; private set ; }
        public int SkillReducePer3C { get ; private set ; }
        public int SkillReducePer4C { get ; private set ; }
        public int SkillReducePer5C { get ; private set ; }
        public int SkillReducePer6C { get ; private set ; }
        public int SkillReducePer7C { get ; private set ; }
        public int SkillAddPerAC { get ; private set ; }
        public int SkillAddPerBC { get ; private set ; }
        public int SkillAddPerCC { get ; private set ; }
        public int SkillAddPerDC { get ; private set ; }
        public int SkillAddPerEC { get ; private set ; }
        public int SkillAddPerFC { get ; private set ; }
        public int SkillAddPerGC { get ; private set ; }
        public int SkillReducePerAC { get ; private set ; }
        public int SkillReducePerBC { get ; private set ; }
        public int SkillReducePerCC { get ; private set ; }
        public int SkillReducePerDC { get ; private set ; }
        public int SkillReducePerEC { get ; private set ; }
        public int SkillReducePerFC { get ; private set ; }
        public int SkillReducePerGC { get ; private set ; }
        public override string getKey()
        {
@@ -121,33 +121,33 @@
            
                MissC=IsNumeric(rawContents[28]) ? int.Parse(rawContents[28]):0; 
            
                SkillAddPer1C=IsNumeric(rawContents[29]) ? int.Parse(rawContents[29]):0;
                SkillAddPerAC=IsNumeric(rawContents[29]) ? int.Parse(rawContents[29]):0;
            
                SkillAddPer2C=IsNumeric(rawContents[30]) ? int.Parse(rawContents[30]):0;
                SkillAddPerBC=IsNumeric(rawContents[30]) ? int.Parse(rawContents[30]):0;
            
                SkillAddPer3C=IsNumeric(rawContents[31]) ? int.Parse(rawContents[31]):0;
                SkillAddPerCC=IsNumeric(rawContents[31]) ? int.Parse(rawContents[31]):0;
            
                SkillAddPer4C=IsNumeric(rawContents[32]) ? int.Parse(rawContents[32]):0;
                SkillAddPerDC=IsNumeric(rawContents[32]) ? int.Parse(rawContents[32]):0;
            
                SkillAddPer5C=IsNumeric(rawContents[33]) ? int.Parse(rawContents[33]):0;
                SkillAddPerEC=IsNumeric(rawContents[33]) ? int.Parse(rawContents[33]):0;
            
                SkillAddPer6C=IsNumeric(rawContents[34]) ? int.Parse(rawContents[34]):0;
                SkillAddPerFC=IsNumeric(rawContents[34]) ? int.Parse(rawContents[34]):0;
            
                SkillAddPer7C=IsNumeric(rawContents[35]) ? int.Parse(rawContents[35]):0;
                SkillAddPerGC=IsNumeric(rawContents[35]) ? int.Parse(rawContents[35]):0;
            
                SkillReducePer1C=IsNumeric(rawContents[36]) ? int.Parse(rawContents[36]):0;
                SkillReducePerAC=IsNumeric(rawContents[36]) ? int.Parse(rawContents[36]):0;
            
                SkillReducePer2C=IsNumeric(rawContents[37]) ? int.Parse(rawContents[37]):0;
                SkillReducePerBC=IsNumeric(rawContents[37]) ? int.Parse(rawContents[37]):0;
            
                SkillReducePer3C=IsNumeric(rawContents[38]) ? int.Parse(rawContents[38]):0;
                SkillReducePerCC=IsNumeric(rawContents[38]) ? int.Parse(rawContents[38]):0;
            
                SkillReducePer4C=IsNumeric(rawContents[39]) ? int.Parse(rawContents[39]):0;
                SkillReducePerDC=IsNumeric(rawContents[39]) ? int.Parse(rawContents[39]):0;
            
                SkillReducePer5C=IsNumeric(rawContents[40]) ? int.Parse(rawContents[40]):0;
                SkillReducePerEC=IsNumeric(rawContents[40]) ? int.Parse(rawContents[40]):0;
            
                SkillReducePer6C=IsNumeric(rawContents[41]) ? int.Parse(rawContents[41]):0;
                SkillReducePerFC=IsNumeric(rawContents[41]) ? int.Parse(rawContents[41]):0;
            
                SkillReducePer7C=IsNumeric(rawContents[42]) ? int.Parse(rawContents[42]):0;
                SkillReducePerGC=IsNumeric(rawContents[42]) ? int.Parse(rawContents[42]):0;
            }
            catch (Exception ex)
            {
Core/GameEngine/Model/Config/EquipGSParamConfig.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: e238f9455d4062c4c867b41cfea2f046
timeCreated: 1548160973
timeCreated: 1548314012
licenseType: Pro
MonoImporter:
  serializedVersion: 2
Core/GameEngine/Model/Config/JadeDynastyBossConfig.cs
@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Friday, January 18, 2019
//    [  Date ]:           Thursday, January 24, 2019
//--------------------------------------------------------
using UnityEngine;
@@ -17,7 +17,8 @@
        public int RealmLV { get ; private set ; }
        public int ZhuXianScore { get ; private set ; }
        public string dropItems { get ; private set; } 
        public string PortraitID { get ; private set; }
        public string PortraitID { get ; private set; }
        public int[] conditionSorts;
        public override string getKey()
        {
@@ -39,7 +40,14 @@
            
                dropItems = rawContents[5].Trim();
            
                PortraitID = rawContents[6].Trim();
                PortraitID = rawContents[6].Trim();
                string[] conditionSortsStringArray = rawContents[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                conditionSorts = new int[conditionSortsStringArray.Length];
                for (int i=0;i<conditionSortsStringArray.Length;i++)
                {
                     int.TryParse(conditionSortsStringArray[i],out conditionSorts[i]);
                }
            }
            catch (Exception ex)
            {
Core/GameEngine/Model/Config/JadeDynastyBossConfig.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: bc9f70989c6d3344aad5bd0dbda7bc2b
timeCreated: 1547804881
timeCreated: 1548302334
licenseType: Pro
MonoImporter:
  serializedVersion: 2
Core/GameEngine/Model/Config/JadeDynastyTowerConfig.cs
@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Tuesday, January 22, 2019
//    [  Date ]:           Thursday, January 24, 2019
//--------------------------------------------------------
using UnityEngine;
@@ -14,6 +14,8 @@
        public int floorId { get ; private set ; }
        public int floorIndex { get ; private set ; }
        public string floorName { get ; private set; } 
        public int[] rewardIdsFirstS;
        public int[] rewardCountsFirstS;
        public int[] rewardIdsLevelS;
        public int[] rewardCountsLevelS;
        public int[] rewardIdsLevelA;
@@ -38,53 +40,67 @@
            
                floorName = rawContents[2].Trim();
            
                string[] rewardIdsLevelSStringArray = rawContents[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                string[] rewardIdsFirstSStringArray = rawContents[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                rewardIdsFirstS = new int[rewardIdsFirstSStringArray.Length];
                for (int i=0;i<rewardIdsFirstSStringArray.Length;i++)
                {
                     int.TryParse(rewardIdsFirstSStringArray[i],out rewardIdsFirstS[i]);
                }
                string[] rewardCountsFirstSStringArray = rawContents[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                rewardCountsFirstS = new int[rewardCountsFirstSStringArray.Length];
                for (int i=0;i<rewardCountsFirstSStringArray.Length;i++)
                {
                     int.TryParse(rewardCountsFirstSStringArray[i],out rewardCountsFirstS[i]);
                }
                string[] rewardIdsLevelSStringArray = rawContents[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                rewardIdsLevelS = new int[rewardIdsLevelSStringArray.Length];
                for (int i=0;i<rewardIdsLevelSStringArray.Length;i++)
                {
                     int.TryParse(rewardIdsLevelSStringArray[i],out rewardIdsLevelS[i]);
                }
            
                string[] rewardCountsLevelSStringArray = rawContents[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                string[] rewardCountsLevelSStringArray = rawContents[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                rewardCountsLevelS = new int[rewardCountsLevelSStringArray.Length];
                for (int i=0;i<rewardCountsLevelSStringArray.Length;i++)
                {
                     int.TryParse(rewardCountsLevelSStringArray[i],out rewardCountsLevelS[i]);
                }
            
                string[] rewardIdsLevelAStringArray = rawContents[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                string[] rewardIdsLevelAStringArray = rawContents[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                rewardIdsLevelA = new int[rewardIdsLevelAStringArray.Length];
                for (int i=0;i<rewardIdsLevelAStringArray.Length;i++)
                {
                     int.TryParse(rewardIdsLevelAStringArray[i],out rewardIdsLevelA[i]);
                }
            
                string[] rewardCountsLevelAStringArray = rawContents[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                string[] rewardCountsLevelAStringArray = rawContents[8].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                rewardCountsLevelA = new int[rewardCountsLevelAStringArray.Length];
                for (int i=0;i<rewardCountsLevelAStringArray.Length;i++)
                {
                     int.TryParse(rewardCountsLevelAStringArray[i],out rewardCountsLevelA[i]);
                }
            
                string[] rewardIdsLevelBStringArray = rawContents[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                string[] rewardIdsLevelBStringArray = rawContents[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                rewardIdsLevelB = new int[rewardIdsLevelBStringArray.Length];
                for (int i=0;i<rewardIdsLevelBStringArray.Length;i++)
                {
                     int.TryParse(rewardIdsLevelBStringArray[i],out rewardIdsLevelB[i]);
                }
            
                string[] rewardCountsLevelBStringArray = rawContents[8].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                string[] rewardCountsLevelBStringArray = rawContents[10].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                rewardCountsLevelB = new int[rewardCountsLevelBStringArray.Length];
                for (int i=0;i<rewardCountsLevelBStringArray.Length;i++)
                {
                     int.TryParse(rewardCountsLevelBStringArray[i],out rewardCountsLevelB[i]);
                }
            
                unLockEquipPlace=IsNumeric(rawContents[9]) ? int.Parse(rawContents[9]):0;
                unLockEquipPlace=IsNumeric(rawContents[11]) ? int.Parse(rawContents[11]):0;
            
                specialRewardDescription = rawContents[10].Trim();
                specialRewardDescription = rawContents[12].Trim();
            
                fightPower=IsNumeric(rawContents[11]) ? int.Parse(rawContents[11]):0;
                fightPower=IsNumeric(rawContents[13]) ? int.Parse(rawContents[13]):0;
            }
            catch (Exception ex)
            {
Core/GameEngine/Model/Config/JadeDynastyTowerConfig.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: bcb7d8fc32f347441a4024465ce1df51
timeCreated: 1548127880
timeCreated: 1548315669
licenseType: Pro
MonoImporter:
  serializedVersion: 2
Core/GameEngine/Model/Config/SkillFrameAnimationConfig.cs
@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Tuesday, January 22, 2019
//    [  Date ]:           Wednesday, January 23, 2019
//--------------------------------------------------------
using UnityEngine;
@@ -14,7 +14,9 @@
        public int skillTypeId { get ; private set ; }
        public int totalTime { get ; private set ; }
        public string[] spriteKeys;
        public string descriptionIcon { get ; private set; }
        public string descriptionIcon { get ; private set; }
        public Vector3 sizeDelta { get ; private set; }
        public Vector3 position { get ; private set; }
        public override string getKey()
        {
@@ -30,7 +32,11 @@
            
                spriteKeys = rawContents[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            
                descriptionIcon = rawContents[3].Trim();
                descriptionIcon = rawContents[3].Trim();
                sizeDelta=rawContents[4].Vector3Parse();
                position=rawContents[5].Vector3Parse();
            }
            catch (Exception ex)
            {
Core/GameEngine/Model/Config/SkillFrameAnimationConfig.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: d2052f17dcdee634082ca8f214df0ecd
timeCreated: 1548156734
timeCreated: 1548246768
licenseType: Pro
MonoImporter:
  serializedVersion: 2
Core/GameEngine/Model/TelPartialConfig/tagEquipGSParamConfig.cs
@@ -54,19 +54,19 @@
            _tagGsProValueDict.Add(AttrEnum.SkillHurtPrecent, gsModel.SkillAtkRateReduceC);
            _tagGsProValueDict.Add(AttrEnum.HIT, gsModel.HitC);
            _tagGsProValueDict.Add(AttrEnum.MISS, gsModel.MissC);
            _tagGsProValueDict.Add(AttrEnum.SkillAddPer1, gsModel.SkillAddPer1C);
            _tagGsProValueDict.Add(AttrEnum.SkillAddPer2, gsModel.SkillAddPer2C);
            _tagGsProValueDict.Add(AttrEnum.SkillAddPer3, gsModel.SkillAddPer3C);
            _tagGsProValueDict.Add(AttrEnum.SkillAddPer4, gsModel.SkillAddPer4C);
            _tagGsProValueDict.Add(AttrEnum.SkillAddPer5, gsModel.SkillAddPer5C);
            _tagGsProValueDict.Add(AttrEnum.SkillAddPer6, gsModel.SkillAddPer6C);
            _tagGsProValueDict.Add(AttrEnum.SkillReducePer1, gsModel.SkillReducePer1C);
            _tagGsProValueDict.Add(AttrEnum.SkillReducePer2, gsModel.SkillReducePer2C);
            _tagGsProValueDict.Add(AttrEnum.SkillReducePer3, gsModel.SkillReducePer3C);
            _tagGsProValueDict.Add(AttrEnum.SkillReducePer4, gsModel.SkillReducePer4C);
            _tagGsProValueDict.Add(AttrEnum.SkillReducePer5, gsModel.SkillReducePer5C);
            _tagGsProValueDict.Add(AttrEnum.SkillReducePer6, gsModel.SkillReducePer6C);
            _tagGsProValueDict.Add(AttrEnum.SkillReducePer7, gsModel.SkillReducePer7C);
            _tagGsProValueDict.Add(AttrEnum.SkillAddPerA, gsModel.SkillAddPerAC);
            _tagGsProValueDict.Add(AttrEnum.SkillAddPerB, gsModel.SkillAddPerBC);
            _tagGsProValueDict.Add(AttrEnum.SkillAddPerC, gsModel.SkillAddPerCC);
            _tagGsProValueDict.Add(AttrEnum.SkillAddPerD, gsModel.SkillAddPerDC);
            _tagGsProValueDict.Add(AttrEnum.SkillAddPerE, gsModel.SkillAddPerEC);
            _tagGsProValueDict.Add(AttrEnum.SkillAddPerF, gsModel.SkillAddPerFC);
            _tagGsProValueDict.Add(AttrEnum.SkillReducePerA, gsModel.SkillReducePerAC);
            _tagGsProValueDict.Add(AttrEnum.SkillReducePerB, gsModel.SkillReducePerBC);
            _tagGsProValueDict.Add(AttrEnum.SkillReducePerC, gsModel.SkillReducePerCC);
            _tagGsProValueDict.Add(AttrEnum.SkillReducePerD, gsModel.SkillReducePerDC);
            _tagGsProValueDict.Add(AttrEnum.SkillReducePerE, gsModel.SkillReducePerEC);
            _tagGsProValueDict.Add(AttrEnum.SkillReducePerF, gsModel.SkillReducePerFC);
            _tagGsProValueDict.Add(AttrEnum.SkillReducePerG, gsModel.SkillReducePerGC);
            return _tagGsProValueDict;
        }
    }
Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0403_tagPlayerLoginLoadOK.cs
@@ -15,6 +15,8 @@
    {
        base.Done(vNetPack);
        var vNetData = vNetPack as H0403_tagPlayerLoginLoadOK;
        StageLoadTimeOutCatcher.RecordProtocol(vNetPack.socketType, "0403", DateTime.Now);
        GameNetSystem.Instance.netState = GameNetSystem.NetState.Connected;
        finishedLogin = true;
        GA_Hero.s_MapSwitching = false;
Lua/Gen/DebugUtilityWrap.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 2e45bdc7ab1407847ac64c5843fb2d66
timeCreated: 1547610180
timeCreated: 1548252570
licenseType: Pro
MonoImporter:
  serializedVersion: 2
Lua/Gen/DelegatesGensBridge.cs
@@ -171,7 +171,7 @@
#endif
        }
        
        public Snxxz.UI.DailyQuestModel __Gen_Delegate_Imp7(object p0)
        public void __Gen_Delegate_Imp7(object p0, object p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -181,63 +181,20 @@
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                ObjectTranslator translator = luaEnv.translator;
                translator.PushAny(L, p0);
                translator.PushAny(L, p1);
                
                PCall(L, 1, 1, errFunc);
                PCall(L, 2, 0, errFunc);
                
                
                Snxxz.UI.DailyQuestModel __gen_ret = (Snxxz.UI.DailyQuestModel)translator.GetObject(L, errFunc + 1, typeof(Snxxz.UI.DailyQuestModel));
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        
        public Snxxz.UI.DungeonModel __Gen_Delegate_Imp8(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
            {
#endif
                RealStatePtr L = luaEnv.rawL;
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                ObjectTranslator translator = luaEnv.translator;
                translator.PushAny(L, p0);
                PCall(L, 1, 1, errFunc);
                Snxxz.UI.DungeonModel __gen_ret = (Snxxz.UI.DungeonModel)translator.GetObject(L, errFunc + 1, typeof(Snxxz.UI.DungeonModel));
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        public Snxxz.UI.ActivityModel __Gen_Delegate_Imp9(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
            {
#endif
                RealStatePtr L = luaEnv.rawL;
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                ObjectTranslator translator = luaEnv.translator;
                translator.PushAny(L, p0);
                PCall(L, 1, 1, errFunc);
                Snxxz.UI.ActivityModel __gen_ret = (Snxxz.UI.ActivityModel)translator.GetObject(L, errFunc + 1, typeof(Snxxz.UI.ActivityModel));
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        public void __Gen_Delegate_Imp10(object p0)
        public void __Gen_Delegate_Imp8(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -259,7 +216,73 @@
#endif
        }
        
        public void __Gen_Delegate_Imp11(object p0, int p1, object p2)
        public Snxxz.UI.DailyQuestModel __Gen_Delegate_Imp9(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
            {
#endif
                RealStatePtr L = luaEnv.rawL;
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                ObjectTranslator translator = luaEnv.translator;
                translator.PushAny(L, p0);
                PCall(L, 1, 1, errFunc);
                Snxxz.UI.DailyQuestModel __gen_ret = (Snxxz.UI.DailyQuestModel)translator.GetObject(L, errFunc + 1, typeof(Snxxz.UI.DailyQuestModel));
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        public Snxxz.UI.DungeonModel __Gen_Delegate_Imp10(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
            {
#endif
                RealStatePtr L = luaEnv.rawL;
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                ObjectTranslator translator = luaEnv.translator;
                translator.PushAny(L, p0);
                PCall(L, 1, 1, errFunc);
                Snxxz.UI.DungeonModel __gen_ret = (Snxxz.UI.DungeonModel)translator.GetObject(L, errFunc + 1, typeof(Snxxz.UI.DungeonModel));
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        public Snxxz.UI.ActivityModel __Gen_Delegate_Imp11(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
            {
#endif
                RealStatePtr L = luaEnv.rawL;
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                ObjectTranslator translator = luaEnv.translator;
                translator.PushAny(L, p0);
                PCall(L, 1, 1, errFunc);
                Snxxz.UI.ActivityModel __gen_ret = (Snxxz.UI.ActivityModel)translator.GetObject(L, errFunc + 1, typeof(Snxxz.UI.ActivityModel));
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        public void __Gen_Delegate_Imp12(object p0, int p1, object p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -283,7 +306,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp12(object p0, int p1)
        public void __Gen_Delegate_Imp13(object p0, int p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -294,29 +317,6 @@
                ObjectTranslator translator = luaEnv.translator;
                translator.PushAny(L, p0);
                LuaAPI.xlua_pushinteger(L, p1);
                PCall(L, 2, 0, errFunc);
                LuaAPI.lua_settop(L, errFunc - 1);
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        public void __Gen_Delegate_Imp13(object p0, object p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
            {
#endif
                RealStatePtr L = luaEnv.rawL;
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                ObjectTranslator translator = luaEnv.translator;
                translator.PushAny(L, p0);
                translator.PushAny(L, p1);
                
                PCall(L, 2, 0, errFunc);
                
@@ -2566,7 +2566,29 @@
#endif
        }
        
        public Snxxz.UI.FashionDressModel __Gen_Delegate_Imp112(object p0)
        public Snxxz.UI.KingFairyModel __Gen_Delegate_Imp112(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
            {
#endif
                RealStatePtr L = luaEnv.rawL;
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                ObjectTranslator translator = luaEnv.translator;
                translator.PushAny(L, p0);
                PCall(L, 1, 1, errFunc);
                Snxxz.UI.KingFairyModel __gen_ret = (Snxxz.UI.KingFairyModel)translator.GetObject(L, errFunc + 1, typeof(Snxxz.UI.KingFairyModel));
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        public Snxxz.UI.FashionDressModel __Gen_Delegate_Imp113(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2588,7 +2610,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp113(object p0, object p1, bool p2)
        public void __Gen_Delegate_Imp114(object p0, object p1, bool p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2612,7 +2634,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp114(object p0, object p1, out Snxxz.UI.FashionDecomposeModel.DecomposeItem p2)
        public bool __Gen_Delegate_Imp115(object p0, object p1, out Snxxz.UI.FashionDecomposeModel.DecomposeItem p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2636,7 +2658,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp115(object p0, out System.Collections.Generic.List<ushort> p1, out System.Collections.Generic.List<uint> p2)
        public void __Gen_Delegate_Imp116(object p0, out System.Collections.Generic.List<ushort> p1, out System.Collections.Generic.List<uint> p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2660,7 +2682,7 @@
#endif
        }
        
        public GetItemPathModel __Gen_Delegate_Imp116(object p0)
        public GetItemPathModel __Gen_Delegate_Imp117(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2682,7 +2704,7 @@
#endif
        }
        
        public System.Collections.Generic.Dictionary<int, int> __Gen_Delegate_Imp117(object p0)
        public System.Collections.Generic.Dictionary<int, int> __Gen_Delegate_Imp118(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2704,7 +2726,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp118(object p0, PackType p1, int p2, int p3)
        public void __Gen_Delegate_Imp119(object p0, PackType p1, int p2, int p3)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2729,7 +2751,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp119(object p0, int p1, out Snxxz.UI.FashionDress p2)
        public bool __Gen_Delegate_Imp120(object p0, int p1, out Snxxz.UI.FashionDress p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2753,7 +2775,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp120(object p0, int p1, int p2, out System.Collections.Generic.List<int> p3)
        public bool __Gen_Delegate_Imp121(object p0, int p1, int p2, out System.Collections.Generic.List<int> p3)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2778,7 +2800,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp121(object p0, int p1, out System.Collections.Generic.List<int> p2)
        public bool __Gen_Delegate_Imp122(object p0, int p1, out System.Collections.Generic.List<int> p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2802,7 +2824,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp122(object p0, int p1, int p2, out System.Collections.Generic.Dictionary<int, int> p3)
        public bool __Gen_Delegate_Imp123(object p0, int p1, int p2, out System.Collections.Generic.Dictionary<int, int> p3)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2827,7 +2849,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp123(object p0, int p1, out System.Collections.Generic.Dictionary<int, int> p2)
        public bool __Gen_Delegate_Imp124(object p0, int p1, out System.Collections.Generic.Dictionary<int, int> p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2851,7 +2873,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp124(object p0, ref System.Collections.Generic.List<int> p1)
        public bool __Gen_Delegate_Imp125(object p0, ref System.Collections.Generic.List<int> p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2875,7 +2897,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp125(object p0, out System.Collections.Generic.List<int> p1)
        public bool __Gen_Delegate_Imp126(object p0, out System.Collections.Generic.List<int> p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2898,7 +2920,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp126(object p0, int p1, int p2, int p3, int p4)
        public void __Gen_Delegate_Imp127(object p0, int p1, int p2, int p3, int p4)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2924,7 +2946,7 @@
#endif
        }
        
        public Snxxz.UI.MagicianModel __Gen_Delegate_Imp127(object p0)
        public Snxxz.UI.MagicianModel __Gen_Delegate_Imp128(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2946,7 +2968,7 @@
#endif
        }
        
        public int __Gen_Delegate_Imp128(object p0, Snxxz.UI.ServerItem p1, Snxxz.UI.ServerItem p2)
        public int __Gen_Delegate_Imp129(object p0, Snxxz.UI.ServerItem p1, Snxxz.UI.ServerItem p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2970,7 +2992,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp129(bool p0)
        public void __Gen_Delegate_Imp130(bool p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2992,7 +3014,7 @@
#endif
        }
        
        public Snxxz.UI.GatherSoulDungeonModel __Gen_Delegate_Imp130(object p0)
        public Snxxz.UI.GatherSoulDungeonModel __Gen_Delegate_Imp131(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3014,7 +3036,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp131(object p0, int p1, uint p2)
        public void __Gen_Delegate_Imp132(object p0, int p1, uint p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3038,7 +3060,7 @@
#endif
        }
        
        public Snxxz.UI.GatherSoulComposeModel __Gen_Delegate_Imp132(object p0)
        public Snxxz.UI.GatherSoulComposeModel __Gen_Delegate_Imp133(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3060,7 +3082,7 @@
#endif
        }
        
        public Snxxz.UI.GatheringSoulModel __Gen_Delegate_Imp133(object p0)
        public Snxxz.UI.GatheringSoulModel __Gen_Delegate_Imp134(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3082,7 +3104,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp134(object p0, Snxxz.UI.GatherSoulComposeModel.ComposeCategory p1)
        public void __Gen_Delegate_Imp135(object p0, Snxxz.UI.GatherSoulComposeModel.ComposeCategory p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3105,7 +3127,7 @@
#endif
        }
        
        public System.Collections.Generic.List<Snxxz.UI.GatherSoulComposeModel.ComposeCategory> __Gen_Delegate_Imp135(object p0)
        public System.Collections.Generic.List<Snxxz.UI.GatherSoulComposeModel.ComposeCategory> __Gen_Delegate_Imp136(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3127,7 +3149,7 @@
#endif
        }
        
        public System.Collections.Generic.Dictionary<Snxxz.UI.GatherSoulComposeModel.ComposeCategory, System.Collections.Generic.List<int>> __Gen_Delegate_Imp136(object p0)
        public System.Collections.Generic.Dictionary<Snxxz.UI.GatherSoulComposeModel.ComposeCategory, System.Collections.Generic.List<int>> __Gen_Delegate_Imp137(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3149,7 +3171,7 @@
#endif
        }
        
        public Snxxz.UI.GatherSoulComposeModel.ComposeCategory __Gen_Delegate_Imp137(object p0)
        public Snxxz.UI.GatherSoulComposeModel.ComposeCategory __Gen_Delegate_Imp138(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3171,7 +3193,7 @@
#endif
        }
        
        public Snxxz.UI.VirtualItem __Gen_Delegate_Imp138(object p0)
        public Snxxz.UI.VirtualItem __Gen_Delegate_Imp139(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3193,7 +3215,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp139(object p0, Snxxz.UI.VirtualItem p1)
        public void __Gen_Delegate_Imp140(object p0, Snxxz.UI.VirtualItem p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3216,7 +3238,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp140(object p0, int p1, out Snxxz.UI.GatherSoulComposeModel.Compose p2)
        public bool __Gen_Delegate_Imp141(object p0, int p1, out Snxxz.UI.GatherSoulComposeModel.Compose p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3240,7 +3262,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp141(object p0, UnityEngine.Vector3 p1)
        public void __Gen_Delegate_Imp142(object p0, UnityEngine.Vector3 p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3263,7 +3285,7 @@
#endif
        }
        
        public System.Collections.IEnumerator __Gen_Delegate_Imp142(object p0, object p1)
        public System.Collections.IEnumerator __Gen_Delegate_Imp143(object p0, object p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3286,7 +3308,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp143(object p0, ScrollerDataType p1, int p2, out float p3)
        public bool __Gen_Delegate_Imp144(object p0, ScrollerDataType p1, int p2, out float p3)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3311,7 +3333,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp144(object p0, int p1, int p2, bool p3)
        public void __Gen_Delegate_Imp145(object p0, int p1, int p2, bool p3)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3336,7 +3358,7 @@
#endif
        }
        
        public Snxxz.UI.GatherSoulDungeonHelp __Gen_Delegate_Imp145(object p0)
        public Snxxz.UI.GatherSoulDungeonHelp __Gen_Delegate_Imp146(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3358,7 +3380,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp146(object p0, Snxxz.UI.GatherSoulDungeonHelp p1)
        public void __Gen_Delegate_Imp147(object p0, Snxxz.UI.GatherSoulDungeonHelp p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3381,7 +3403,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp147(object p0, int p1, out System.Collections.Generic.List<Snxxz.UI.GatherSoulDungeonModel.ItemInfo> p2)
        public bool __Gen_Delegate_Imp148(object p0, int p1, out System.Collections.Generic.List<Snxxz.UI.GatherSoulDungeonModel.ItemInfo> p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3405,7 +3427,7 @@
#endif
        }
        
        public int __Gen_Delegate_Imp148(object p0, Snxxz.UI.GatherSoulDungeonModel.ItemInfo p1, Snxxz.UI.GatherSoulDungeonModel.ItemInfo p2)
        public int __Gen_Delegate_Imp149(object p0, Snxxz.UI.GatherSoulDungeonModel.ItemInfo p1, Snxxz.UI.GatherSoulDungeonModel.ItemInfo p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3429,7 +3451,7 @@
#endif
        }
        
        public Snxxz.UI.VirtualPackModel __Gen_Delegate_Imp149(object p0)
        public Snxxz.UI.VirtualPackModel __Gen_Delegate_Imp150(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3451,7 +3473,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp150(object p0, ItemWinBtnType p1, object p2)
        public void __Gen_Delegate_Imp151(object p0, ItemWinBtnType p1, object p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3475,7 +3497,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp151(object p0, PackType p1, int p2)
        public void __Gen_Delegate_Imp152(object p0, PackType p1, int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3499,7 +3521,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp152(object p0, Snxxz.UI.SortType p1, int p2)
        public void __Gen_Delegate_Imp153(object p0, Snxxz.UI.SortType p1, int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3523,7 +3545,7 @@
#endif
        }
        
        public int __Gen_Delegate_Imp153(object p0, int p1, int p2)
        public int __Gen_Delegate_Imp154(object p0, int p1, int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3547,7 +3569,7 @@
#endif
        }
        
        public System.Collections.IEnumerator __Gen_Delegate_Imp154(object p0, UnityEngine.Vector3 p1, UnityEngine.Vector3 p2)
        public System.Collections.IEnumerator __Gen_Delegate_Imp155(object p0, UnityEngine.Vector3 p1, UnityEngine.Vector3 p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3571,7 +3593,7 @@
#endif
        }
        
        public System.Collections.Generic.List<Snxxz.UI.GatherSoulItem> __Gen_Delegate_Imp155(object p0)
        public System.Collections.Generic.List<Snxxz.UI.GatherSoulItem> __Gen_Delegate_Imp156(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3593,7 +3615,7 @@
#endif
        }
        
        public string __Gen_Delegate_Imp156(int p0)
        public string __Gen_Delegate_Imp157(int p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3615,7 +3637,7 @@
#endif
        }
        
        public int __Gen_Delegate_Imp157(object p0, object p1)
        public int __Gen_Delegate_Imp158(object p0, object p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3638,7 +3660,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp158(object p0, PackType p1)
        public void __Gen_Delegate_Imp159(object p0, PackType p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3661,7 +3683,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp159(object p0, int p1, ref System.Collections.Generic.List<Snxxz.UI.GatherSoulItem> p2)
        public void __Gen_Delegate_Imp160(object p0, int p1, ref System.Collections.Generic.List<Snxxz.UI.GatherSoulItem> p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3686,7 +3708,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp160(object p0, object p1, int p2, out int p3)
        public bool __Gen_Delegate_Imp161(object p0, object p1, int p2, out int p3)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3711,7 +3733,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp161(object p0, object p1, out int p2)
        public bool __Gen_Delegate_Imp162(object p0, object p1, out int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3735,7 +3757,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp162(object p0, int p1, object p2)
        public bool __Gen_Delegate_Imp163(object p0, int p1, object p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3759,7 +3781,7 @@
#endif
        }
        
        public int __Gen_Delegate_Imp163(object p0, int p1, object p2)
        public int __Gen_Delegate_Imp164(object p0, int p1, object p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3783,7 +3805,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp164(object p0, int p1, int p2)
        public bool __Gen_Delegate_Imp165(object p0, int p1, int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3807,7 +3829,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp165(object p0, object p1, int p2, int p3)
        public bool __Gen_Delegate_Imp166(object p0, object p1, int p2, int p3)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3832,7 +3854,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp166(object p0, object p1, int p2)
        public void __Gen_Delegate_Imp167(object p0, object p1, int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3856,7 +3878,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp167(object p0, Snxxz.UI.VirtualItem p1)
        public bool __Gen_Delegate_Imp168(object p0, Snxxz.UI.VirtualItem p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3879,7 +3901,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp168(object p0, int p1, out Snxxz.UI.GatherSoulHoleCondition p2)
        public bool __Gen_Delegate_Imp169(object p0, int p1, out Snxxz.UI.GatherSoulHoleCondition p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3903,7 +3925,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp169(object p0, int p1, out Snxxz.UI.GatherSoulItem p2)
        public bool __Gen_Delegate_Imp170(object p0, int p1, out Snxxz.UI.GatherSoulItem p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3927,7 +3949,7 @@
#endif
        }
        
        public int __Gen_Delegate_Imp170(object p0, int p1, int p2, int p3)
        public int __Gen_Delegate_Imp171(object p0, int p1, int p2, int p3)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3952,7 +3974,7 @@
#endif
        }
        
        public int __Gen_Delegate_Imp171(object p0, int p1, ulong p2)
        public int __Gen_Delegate_Imp172(object p0, int p1, ulong p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3976,7 +3998,7 @@
#endif
        }
        
        public int __Gen_Delegate_Imp172(object p0, int p1, int p2, bool p3)
        public int __Gen_Delegate_Imp173(object p0, int p1, int p2, bool p3)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4001,7 +4023,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp173(object p0, object p1, ref System.Collections.Generic.Dictionary<int, int> p2)
        public void __Gen_Delegate_Imp174(object p0, object p1, ref System.Collections.Generic.Dictionary<int, int> p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4026,7 +4048,7 @@
#endif
        }
        
        public int __Gen_Delegate_Imp174(object p0, PackType p1)
        public int __Gen_Delegate_Imp175(object p0, PackType p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4049,7 +4071,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp175(object p0, PackType p1, out System.Collections.Generic.List<int> p2)
        public bool __Gen_Delegate_Imp176(object p0, PackType p1, out System.Collections.Generic.List<int> p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4073,7 +4095,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp176(object p0, PackType p1, ref System.Collections.Generic.List<Snxxz.UI.VirtualPackItem> p2, object p3)
        public void __Gen_Delegate_Imp177(object p0, PackType p1, ref System.Collections.Generic.List<Snxxz.UI.VirtualPackItem> p2, object p3)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4099,7 +4121,7 @@
#endif
        }
        
        public Snxxz.UI.JadeDynastyBossModel __Gen_Delegate_Imp177(object p0)
        public Snxxz.UI.JadeDynastyBossModel __Gen_Delegate_Imp178(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4121,7 +4143,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp178(object p0, System.DateTime p1, object p2)
        public void __Gen_Delegate_Imp179(object p0, System.DateTime p1, object p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4145,7 +4167,7 @@
#endif
        }
        
        public ulong __Gen_Delegate_Imp179(object p0)
        public ulong __Gen_Delegate_Imp180(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4167,7 +4189,7 @@
#endif
        }
        
        public Snxxz.UI.MapModel __Gen_Delegate_Imp180(object p0)
        public Snxxz.UI.MapModel __Gen_Delegate_Imp181(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4189,7 +4211,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp181(object p0, int p1, out System.Collections.Generic.List<Snxxz.UI.Item> p2)
        public bool __Gen_Delegate_Imp182(object p0, int p1, out System.Collections.Generic.List<Snxxz.UI.Item> p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4213,7 +4235,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp182(object p0, int p1, out Snxxz.UI.JadeDynastyBossCondition p2)
        public bool __Gen_Delegate_Imp183(object p0, int p1, out Snxxz.UI.JadeDynastyBossCondition p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4237,7 +4259,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp183(object p0, int p1, out Snxxz.UI.JadeDynastyBossLine p2)
        public bool __Gen_Delegate_Imp184(object p0, int p1, out Snxxz.UI.JadeDynastyBossLine p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4261,7 +4283,7 @@
#endif
        }
        
        public int __Gen_Delegate_Imp184(Snxxz.UI.JadeDynastyBossData p0, Snxxz.UI.JadeDynastyBossData p1)
        public int __Gen_Delegate_Imp185(Snxxz.UI.JadeDynastyBossData p0, Snxxz.UI.JadeDynastyBossData p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4284,7 +4306,7 @@
#endif
        }
        
        public System.Collections.IEnumerator __Gen_Delegate_Imp185(object p0, float p1)
        public System.Collections.IEnumerator __Gen_Delegate_Imp186(object p0, float p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4307,7 +4329,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp186(object p0, Snxxz.UI.Item p1)
        public bool __Gen_Delegate_Imp187(object p0, Snxxz.UI.Item p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4330,7 +4352,215 @@
#endif
        }
        
        public Snxxz.UI.KingTreasureModel __Gen_Delegate_Imp187(object p0)
        public int __Gen_Delegate_Imp188(object p0, Snxxz.UI.FindPreciousModel.BossKillRecord p1, Snxxz.UI.FindPreciousModel.BossKillRecord p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
            {
#endif
                RealStatePtr L = luaEnv.rawL;
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                ObjectTranslator translator = luaEnv.translator;
                translator.PushAny(L, p0);
                translator.Push(L, p1);
                translator.Push(L, p2);
                PCall(L, 3, 1, errFunc);
                int __gen_ret = LuaAPI.xlua_tointeger(L, errFunc + 1);
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        public Snxxz.UI.JadeDynastyDecomposeModel __Gen_Delegate_Imp189(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
            {
#endif
                RealStatePtr L = luaEnv.rawL;
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                ObjectTranslator translator = luaEnv.translator;
                translator.PushAny(L, p0);
                PCall(L, 1, 1, errFunc);
                Snxxz.UI.JadeDynastyDecomposeModel __gen_ret = (Snxxz.UI.JadeDynastyDecomposeModel)translator.GetObject(L, errFunc + 1, typeof(Snxxz.UI.JadeDynastyDecomposeModel));
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        public Snxxz.UI.JadeDynastySkillModel __Gen_Delegate_Imp190(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
            {
#endif
                RealStatePtr L = luaEnv.rawL;
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                ObjectTranslator translator = luaEnv.translator;
                translator.PushAny(L, p0);
                PCall(L, 1, 1, errFunc);
                Snxxz.UI.JadeDynastySkillModel __gen_ret = (Snxxz.UI.JadeDynastySkillModel)translator.GetObject(L, errFunc + 1, typeof(Snxxz.UI.JadeDynastySkillModel));
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        public UnityEngine.Transform __Gen_Delegate_Imp191(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
            {
#endif
                RealStatePtr L = luaEnv.rawL;
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                ObjectTranslator translator = luaEnv.translator;
                translator.PushAny(L, p0);
                PCall(L, 1, 1, errFunc);
                UnityEngine.Transform __gen_ret = (UnityEngine.Transform)translator.GetObject(L, errFunc + 1, typeof(UnityEngine.Transform));
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        public Snxxz.UI.JadeDynastySkillState __Gen_Delegate_Imp192(object p0, int p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
            {
#endif
                RealStatePtr L = luaEnv.rawL;
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                ObjectTranslator translator = luaEnv.translator;
                translator.PushAny(L, p0);
                LuaAPI.xlua_pushinteger(L, p1);
                PCall(L, 2, 1, errFunc);
                Snxxz.UI.JadeDynastySkillState __gen_ret;translator.Get(L, errFunc + 1, out __gen_ret);
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        public bool __Gen_Delegate_Imp193(object p0, int p1, out Snxxz.UI.JadeDynastySkillCondition p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
            {
#endif
                RealStatePtr L = luaEnv.rawL;
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                ObjectTranslator translator = luaEnv.translator;
                translator.PushAny(L, p0);
                LuaAPI.xlua_pushinteger(L, p1);
                PCall(L, 2, 2, errFunc);
                translator.Get(L, errFunc + 2, out p2);
                bool __gen_ret = LuaAPI.lua_toboolean(L, errFunc + 1);
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        public bool __Gen_Delegate_Imp194(object p0, int p1, out UnityEngine.Sprite[] p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
            {
#endif
                RealStatePtr L = luaEnv.rawL;
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                ObjectTranslator translator = luaEnv.translator;
                translator.PushAny(L, p0);
                LuaAPI.xlua_pushinteger(L, p1);
                PCall(L, 2, 2, errFunc);
                p2 = (UnityEngine.Sprite[])translator.GetObject(L, errFunc + 2, typeof(UnityEngine.Sprite[]));
                bool __gen_ret = LuaAPI.lua_toboolean(L, errFunc + 1);
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        public void __Gen_Delegate_Imp195(object p0, Snxxz.UI.ActivateShow.ActivateFunc p1, int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
            {
#endif
                RealStatePtr L = luaEnv.rawL;
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                ObjectTranslator translator = luaEnv.translator;
                translator.PushAny(L, p0);
                translator.Push(L, p1);
                LuaAPI.xlua_pushinteger(L, p2);
                PCall(L, 3, 0, errFunc);
                LuaAPI.lua_settop(L, errFunc - 1);
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        public void __Gen_Delegate_Imp196(object p0, Snxxz.UI.ActivateShow.ActivateFunc p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
            {
#endif
                RealStatePtr L = luaEnv.rawL;
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                ObjectTranslator translator = luaEnv.translator;
                translator.PushAny(L, p0);
                translator.Push(L, p1);
                PCall(L, 2, 0, errFunc);
                LuaAPI.lua_settop(L, errFunc - 1);
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        public Snxxz.UI.KingTreasureModel __Gen_Delegate_Imp197(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4352,7 +4582,7 @@
#endif
        }
        
        public TableConfig.KingTreasureItemConfig __Gen_Delegate_Imp188(object p0)
        public TableConfig.KingTreasureItemConfig __Gen_Delegate_Imp198(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4374,7 +4604,7 @@
#endif
        }
        
        public string __Gen_Delegate_Imp189(object p0, object p1, int p2)
        public string __Gen_Delegate_Imp199(object p0, object p1, int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4398,7 +4628,7 @@
#endif
        }
        
        public Snxxz.UI.KingTreasureShowModel __Gen_Delegate_Imp190(object p0)
        public Snxxz.UI.KingTreasureShowModel __Gen_Delegate_Imp200(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4420,7 +4650,7 @@
#endif
        }
        
        public Snxxz.UI.CrossServerOneVsOne __Gen_Delegate_Imp191(object p0)
        public Snxxz.UI.CrossServerOneVsOne __Gen_Delegate_Imp201(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4442,7 +4672,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp192(object p0, Snxxz.UI.CrossServerOneVsOne p1)
        public void __Gen_Delegate_Imp202(object p0, Snxxz.UI.CrossServerOneVsOne p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4465,7 +4695,7 @@
#endif
        }
        
        public Snxxz.UI.LoginModel __Gen_Delegate_Imp193(object p0)
        public Snxxz.UI.LoginModel __Gen_Delegate_Imp203(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4487,7 +4717,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp194(object p0, object p1, object p2, int p3, bool p4)
        public void __Gen_Delegate_Imp204(object p0, object p1, object p2, int p3, bool p4)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4513,7 +4743,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp195(object p0, byte p1)
        public void __Gen_Delegate_Imp205(object p0, byte p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4536,7 +4766,7 @@
#endif
        }
        
        public PlayerTaskDatas __Gen_Delegate_Imp196(object p0)
        public PlayerTaskDatas __Gen_Delegate_Imp206(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4558,7 +4788,7 @@
#endif
        }
        
        public System.Collections.IEnumerator __Gen_Delegate_Imp197(object p0, int p1, int p2)
        public System.Collections.IEnumerator __Gen_Delegate_Imp207(object p0, int p1, int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4582,7 +4812,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp198(object p0, TreasureCategory p1)
        public void __Gen_Delegate_Imp208(object p0, TreasureCategory p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4605,7 +4835,7 @@
#endif
        }
        
        public Snxxz.UI.VipModel __Gen_Delegate_Imp199(object p0)
        public Snxxz.UI.VipModel __Gen_Delegate_Imp209(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4627,7 +4857,7 @@
#endif
        }
        
        public Snxxz.UI.MarketModel __Gen_Delegate_Imp200(object p0)
        public Snxxz.UI.MarketModel __Gen_Delegate_Imp210(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4649,7 +4879,7 @@
#endif
        }
        
        public Snxxz.UI.FlashSaleModel __Gen_Delegate_Imp201(object p0)
        public Snxxz.UI.FlashSaleModel __Gen_Delegate_Imp211(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4671,7 +4901,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp202(object p0, Snxxz.UI.OperationFlashSale.FlashSaleGift p1)
        public void __Gen_Delegate_Imp212(object p0, Snxxz.UI.OperationFlashSale.FlashSaleGift p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4694,7 +4924,7 @@
#endif
        }
        
        public Snxxz.UI.MysticalPurchaseModel __Gen_Delegate_Imp203(object p0)
        public Snxxz.UI.MysticalPurchaseModel __Gen_Delegate_Imp213(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4716,7 +4946,7 @@
#endif
        }
        
        public Snxxz.UI.ImpactRankModel __Gen_Delegate_Imp204(object p0)
        public Snxxz.UI.ImpactRankModel __Gen_Delegate_Imp214(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4738,7 +4968,7 @@
#endif
        }
        
        public Snxxz.UI.OSRedEnvelopeModel __Gen_Delegate_Imp205(object p0)
        public Snxxz.UI.OSRedEnvelopeModel __Gen_Delegate_Imp215(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4760,7 +4990,7 @@
#endif
        }
        
        public Snxxz.UI.FairyLeagueModel __Gen_Delegate_Imp206(object p0)
        public Snxxz.UI.FairyLeagueModel __Gen_Delegate_Imp216(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4782,7 +5012,7 @@
#endif
        }
        
        public Snxxz.UI.FairyGrabBossModel __Gen_Delegate_Imp207(object p0)
        public Snxxz.UI.FairyGrabBossModel __Gen_Delegate_Imp217(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4804,7 +5034,7 @@
#endif
        }
        
        public Snxxz.UI.OSGiftModel __Gen_Delegate_Imp208(object p0)
        public Snxxz.UI.OSGiftModel __Gen_Delegate_Imp218(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4826,7 +5056,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp209(object p0, Snxxz.UI.Operation p1)
        public void __Gen_Delegate_Imp219(object p0, Snxxz.UI.Operation p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4849,7 +5079,7 @@
#endif
        }
        
        public OpenServiceAchievementModel __Gen_Delegate_Imp210(object p0)
        public OpenServiceAchievementModel __Gen_Delegate_Imp220(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4871,7 +5101,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp211(object p0, int p1, object p2, int p3, int p4)
        public void __Gen_Delegate_Imp221(object p0, int p1, object p2, int p3, int p4)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4897,7 +5127,120 @@
#endif
        }
        
        public Snxxz.UI.RealmModel __Gen_Delegate_Imp212(object p0)
        public Snxxz.UI.ActivateShow.ActivateFunc __Gen_Delegate_Imp222()
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
            {
#endif
                RealStatePtr L = luaEnv.rawL;
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                ObjectTranslator translator = luaEnv.translator;
                PCall(L, 0, 1, errFunc);
                Snxxz.UI.ActivateShow.ActivateFunc __gen_ret;translator.Get(L, errFunc + 1, out __gen_ret);
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        public void __Gen_Delegate_Imp223(Snxxz.UI.ActivateShow.ActivateFunc p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
            {
#endif
                RealStatePtr L = luaEnv.rawL;
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                ObjectTranslator translator = luaEnv.translator;
                translator.Push(L, p0);
                PCall(L, 1, 0, errFunc);
                LuaAPI.lua_settop(L, errFunc - 1);
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        public string __Gen_Delegate_Imp224()
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
            {
#endif
                RealStatePtr L = luaEnv.rawL;
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                PCall(L, 0, 1, errFunc);
                string __gen_ret = LuaAPI.lua_tostring(L, errFunc + 1);
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        public void __Gen_Delegate_Imp225(int p0, int p1, int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
            {
#endif
                RealStatePtr L = luaEnv.rawL;
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                LuaAPI.xlua_pushinteger(L, p0);
                LuaAPI.xlua_pushinteger(L, p1);
                LuaAPI.xlua_pushinteger(L, p2);
                PCall(L, 3, 0, errFunc);
                LuaAPI.lua_settop(L, errFunc - 1);
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        public void __Gen_Delegate_Imp226(int p0, int p1, int p2, int p3)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
            {
#endif
                RealStatePtr L = luaEnv.rawL;
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                LuaAPI.xlua_pushinteger(L, p0);
                LuaAPI.xlua_pushinteger(L, p1);
                LuaAPI.xlua_pushinteger(L, p2);
                LuaAPI.xlua_pushinteger(L, p3);
                PCall(L, 4, 0, errFunc);
                LuaAPI.lua_settop(L, errFunc - 1);
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        public Snxxz.UI.RealmModel __Gen_Delegate_Imp227(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4919,7 +5262,7 @@
#endif
        }
        
        public Snxxz.UI.MagicianModel __Gen_Delegate_Imp213()
        public Snxxz.UI.MagicianModel __Gen_Delegate_Imp228()
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4940,7 +5283,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp214(uint p0, out System.Collections.Generic.Dictionary<int, int> p1)
        public bool __Gen_Delegate_Imp229(uint p0, out System.Collections.Generic.Dictionary<int, int> p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4963,7 +5306,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp215(uint p0, int p1, out int p2)
        public bool __Gen_Delegate_Imp230(uint p0, int p1, out int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4987,7 +5330,7 @@
#endif
        }
        
        public byte __Gen_Delegate_Imp216(int p0, int p1)
        public byte __Gen_Delegate_Imp231(int p0, int p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5010,7 +5353,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp217(int p0, int p1, bool p2)
        public void __Gen_Delegate_Imp232(int p0, int p1, bool p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5034,7 +5377,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp218(Snxxz.UI.EquipShowSwitch.EquipShowSwitchType p0, uint p1)
        public bool __Gen_Delegate_Imp233(Snxxz.UI.EquipShowSwitch.EquipShowSwitchType p0, uint p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5057,7 +5400,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp219(uint p0)
        public void __Gen_Delegate_Imp234(uint p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5079,7 +5422,7 @@
#endif
        }
        
        public System.Collections.Generic.Dictionary<int, string> __Gen_Delegate_Imp220(object p0)
        public System.Collections.Generic.Dictionary<int, string> __Gen_Delegate_Imp235(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5101,7 +5444,7 @@
#endif
        }
        
        public int[] __Gen_Delegate_Imp221(object p0)
        public int[] __Gen_Delegate_Imp236(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5123,7 +5466,7 @@
#endif
        }
        
        public int[] __Gen_Delegate_Imp222(object p0, int p1)
        public int[] __Gen_Delegate_Imp237(object p0, int p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5146,7 +5489,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp223(object p0, int p1, int p2, int p3, out int p4)
        public bool __Gen_Delegate_Imp238(object p0, int p1, int p2, int p3, out int p4)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5172,7 +5515,7 @@
#endif
        }
        
        public Snxxz.UI.GodWeaponInfo __Gen_Delegate_Imp224(object p0, int p1)
        public Snxxz.UI.GodWeaponInfo __Gen_Delegate_Imp239(object p0, int p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5195,7 +5538,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp225(object p0, int p1, out System.Collections.Generic.List<Snxxz.UI.GodWeaponCondition> p2)
        public bool __Gen_Delegate_Imp240(object p0, int p1, out System.Collections.Generic.List<Snxxz.UI.GodWeaponCondition> p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5219,7 +5562,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp226(object p0, int p1, int p2, out int p3)
        public bool __Gen_Delegate_Imp241(object p0, int p1, int p2, out int p3)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5244,7 +5587,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp227(object p0, int p1, out Snxxz.UI.AutoHammerCost p2)
        public bool __Gen_Delegate_Imp242(object p0, int p1, out Snxxz.UI.AutoHammerCost p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5268,7 +5611,7 @@
#endif
        }
        
        public System.Collections.Generic.Dictionary<int, int> __Gen_Delegate_Imp228(object p0, int p1, int p2)
        public System.Collections.Generic.Dictionary<int, int> __Gen_Delegate_Imp243(object p0, int p1, int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5292,7 +5635,7 @@
#endif
        }
        
        public System.Collections.Generic.List<int> __Gen_Delegate_Imp229(object p0, int p1)
        public System.Collections.Generic.List<int> __Gen_Delegate_Imp244(object p0, int p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5315,7 +5658,7 @@
#endif
        }
        
        public string __Gen_Delegate_Imp230(object p0, int p1, int p2)
        public string __Gen_Delegate_Imp245(object p0, int p1, int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5339,7 +5682,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp231(object p0, object p1, object p2)
        public void __Gen_Delegate_Imp246(object p0, object p1, object p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5363,54 +5706,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp232(object p0, Snxxz.UI.ActivateShow.ActivateFunc p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
            {
#endif
                RealStatePtr L = luaEnv.rawL;
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                ObjectTranslator translator = luaEnv.translator;
                translator.PushAny(L, p0);
                translator.Push(L, p1);
                PCall(L, 2, 0, errFunc);
                LuaAPI.lua_settop(L, errFunc - 1);
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        public void __Gen_Delegate_Imp233(object p0, Snxxz.UI.ActivateShow.ActivateFunc p1, int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
            {
#endif
                RealStatePtr L = luaEnv.rawL;
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                ObjectTranslator translator = luaEnv.translator;
                translator.PushAny(L, p0);
                translator.Push(L, p1);
                LuaAPI.xlua_pushinteger(L, p2);
                PCall(L, 3, 0, errFunc);
                LuaAPI.lua_settop(L, errFunc - 1);
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        public bool __Gen_Delegate_Imp234(object p0, int p1, out int p2, out int p3)
        public bool __Gen_Delegate_Imp247(object p0, int p1, out int p2, out int p3)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5435,7 +5731,7 @@
#endif
        }
        
        public Snxxz.UI.FuncSwitchModel __Gen_Delegate_Imp235(object p0)
        public Snxxz.UI.FuncSwitchModel __Gen_Delegate_Imp248(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5457,7 +5753,7 @@
#endif
        }
        
        public System.Collections.Generic.Dictionary<int, Snxxz.UI.FuncSwitchModel.FuncSwithData> __Gen_Delegate_Imp236(object p0)
        public System.Collections.Generic.Dictionary<int, Snxxz.UI.FuncSwitchModel.FuncSwithData> __Gen_Delegate_Imp249(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5479,7 +5775,7 @@
#endif
        }
        
        public Snxxz.UI.TestModel __Gen_Delegate_Imp237(object p0)
        public Snxxz.UI.TestModel __Gen_Delegate_Imp250(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5501,7 +5797,7 @@
#endif
        }
        
        public UIEffect __Gen_Delegate_Imp238(object p0)
        public UIEffect __Gen_Delegate_Imp251(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5523,7 +5819,7 @@
#endif
        }
        
        public Treasure3DConfig __Gen_Delegate_Imp239(object p0)
        public Treasure3DConfig __Gen_Delegate_Imp252(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5545,7 +5841,7 @@
#endif
        }
        
        public Snxxz.UI.AchievementModel __Gen_Delegate_Imp240(object p0)
        public Snxxz.UI.AchievementModel __Gen_Delegate_Imp253(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5567,7 +5863,7 @@
#endif
        }
        
        public UnityEngine.Vector3 __Gen_Delegate_Imp241(object p0, int p1)
        public UnityEngine.Vector3 __Gen_Delegate_Imp254(object p0, int p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5590,7 +5886,7 @@
#endif
        }
        
        public UnityEngine.Vector3 __Gen_Delegate_Imp242(object p0, UnityEngine.Vector3 p1)
        public UnityEngine.Vector3 __Gen_Delegate_Imp255(object p0, UnityEngine.Vector3 p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5613,7 +5909,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp243(object p0, bool p1, bool p2)
        public void __Gen_Delegate_Imp256(object p0, bool p1, bool p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5637,7 +5933,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp244(object p0, Snxxz.UI.TreasureAnimation.TreasureShowStep p1)
        public void __Gen_Delegate_Imp257(object p0, Snxxz.UI.TreasureAnimation.TreasureShowStep p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5660,7 +5956,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp245(object p0, bool p1, int p2)
        public void __Gen_Delegate_Imp258(object p0, bool p1, int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5684,29 +5980,7 @@
#endif
        }
        
        public UnityEngine.Transform __Gen_Delegate_Imp246(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
            {
#endif
                RealStatePtr L = luaEnv.rawL;
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                ObjectTranslator translator = luaEnv.translator;
                translator.PushAny(L, p0);
                PCall(L, 1, 1, errFunc);
                UnityEngine.Transform __gen_ret = (UnityEngine.Transform)translator.GetObject(L, errFunc + 1, typeof(UnityEngine.Transform));
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        public UnityEngine.Vector3 __Gen_Delegate_Imp247(object p0)
        public UnityEngine.Vector3 __Gen_Delegate_Imp259(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5728,7 +6002,7 @@
#endif
        }
        
        public Treasure3DConfig.TreasureParam __Gen_Delegate_Imp248(object p0)
        public Treasure3DConfig.TreasureParam __Gen_Delegate_Imp260(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5750,7 +6024,7 @@
#endif
        }
        
        public Snxxz.UI.UI3DTreasureSelectStage __Gen_Delegate_Imp249()
        public Snxxz.UI.UI3DTreasureSelectStage __Gen_Delegate_Imp261()
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5771,7 +6045,7 @@
#endif
        }
        
        public TreasureCategory __Gen_Delegate_Imp250(object p0)
        public TreasureCategory __Gen_Delegate_Imp262(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5793,7 +6067,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp251(object p0, bool p1, TreasureCategory p2)
        public void __Gen_Delegate_Imp263(object p0, bool p1, TreasureCategory p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5817,7 +6091,7 @@
#endif
        }
        
        public System.Collections.IEnumerator __Gen_Delegate_Imp252(object p0, TreasureCategory p1, object p2)
        public System.Collections.IEnumerator __Gen_Delegate_Imp264(object p0, TreasureCategory p1, object p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5841,7 +6115,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp253(object p0, TreasureCategory p1, bool p2)
        public void __Gen_Delegate_Imp265(object p0, TreasureCategory p1, bool p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5865,7 +6139,7 @@
#endif
        }
        
        public System.Collections.IEnumerator __Gen_Delegate_Imp254(object p0, object p1, float p2)
        public System.Collections.IEnumerator __Gen_Delegate_Imp266(object p0, object p1, float p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -5889,7 +6163,7 @@
#endif
        }
        
        public Snxxz.UI.SignInModel __Gen_Delegate_Imp255(object p0)
        public Snxxz.UI.SignInModel __Gen_Delegate_Imp267(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
Lua/Gen/Resources.meta
File was deleted
Lua/Gen/ServerListCenterWrap.cs
@@ -21,12 +21,14 @@
        {
            ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            System.Type type = typeof(ServerListCenter);
            Utils.BeginObjectRegister(type, L, translator, 0, 10, 6, 3);
            Utils.BeginObjectRegister(type, L, translator, 0, 12, 6, 3);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetServerData", _m_GetServerData);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "RequestJumpUrl", _m_RequestJumpUrl);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "RequestServerList", _m_RequestServerList);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "SetServerlistCommon", _m_SetServerlistCommon);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "RequestServerListPlayer", _m_RequestServerListPlayer);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "SetServerListPlayer", _m_SetServerListPlayer);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "TryGetServerGroup", _m_TryGetServerGroup);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "ParseServerLocalServerList", _m_ParseServerLocalServerList);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetAllServerGroup", _m_GetAllServerGroup);
@@ -179,6 +181,34 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_SetServerlistCommon(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                ServerListCenter gen_to_be_invoked = (ServerListCenter)translator.FastGetCSObj(L, 1);
                {
                    ServerInfoCommon _common = (ServerInfoCommon)translator.GetObject(L, 2, typeof(ServerInfoCommon));
                    gen_to_be_invoked.SetServerlistCommon( _common );
                    return 0;
                }
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_RequestServerListPlayer(RealStatePtr L)
        {
            try {
@@ -207,6 +237,34 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_SetServerListPlayer(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                ServerListCenter gen_to_be_invoked = (ServerListCenter)translator.FastGetCSObj(L, 1);
                {
                    ServerInfoPlayer _serverInfoPlayer = (ServerInfoPlayer)translator.GetObject(L, 2, typeof(ServerInfoPlayer));
                    gen_to_be_invoked.SetServerListPlayer( _serverInfoPlayer );
                    return 0;
                }
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_TryGetServerGroup(RealStatePtr L)
        {
            try {
Lua/Gen/SnxxzUIJadeDynastyBossModelWrap.cs
@@ -21,7 +21,7 @@
        {
            ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            System.Type type = typeof(Snxxz.UI.JadeDynastyBossModel);
            Utils.BeginObjectRegister(type, L, translator, 0, 20, 7, 2);
            Utils.BeginObjectRegister(type, L, translator, 0, 21, 7, 2);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnBeforePlayerDataInitialize", _m_OnBeforePlayerDataInitialize);
@@ -30,6 +30,7 @@
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "UnInit", _m_UnInit);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "IsJadeDynastyBoss", _m_IsJadeDynastyBoss);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "IsBossUnLocked", _m_IsBossUnLocked);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "IsAssistState", _m_IsAssistState);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetJadeDynastyBosses", _m_GetJadeDynastyBosses);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetParticipantCount", _m_GetParticipantCount);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetLatestUnLockBoss", _m_GetLatestUnLockBoss);
@@ -301,6 +302,34 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_IsAssistState(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                Snxxz.UI.JadeDynastyBossModel gen_to_be_invoked = (Snxxz.UI.JadeDynastyBossModel)translator.FastGetCSObj(L, 1);
                {
                        bool gen_ret = gen_to_be_invoked.IsAssistState(  );
                        LuaAPI.lua_pushboolean(L, gen_ret);
                    return 1;
                }
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_GetJadeDynastyBosses(RealStatePtr L)
        {
            try {
Lua/Gen/SnxxzUIJadeDynastySkillModelWrap.cs
New file
@@ -0,0 +1,483 @@
#if USE_UNI_LUA
using LuaAPI = UniLua.Lua;
using RealStatePtr = UniLua.ILuaState;
using LuaCSFunction = UniLua.CSharpFunctionDelegate;
#else
using LuaAPI = XLua.LuaDLL.Lua;
using RealStatePtr = System.IntPtr;
using LuaCSFunction = XLua.LuaDLL.lua_CSFunction;
#endif
using XLua;
using System.Collections.Generic;
namespace XLua.CSObjectWrap
{
    using Utils = XLua.Utils;
    public class SnxxzUIJadeDynastySkillModelWrap
    {
        public static void __Register(RealStatePtr L)
        {
            ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            System.Type type = typeof(Snxxz.UI.JadeDynastySkillModel);
            Utils.BeginObjectRegister(type, L, translator, 0, 11, 3, 1);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnBeforePlayerDataInitialize", _m_OnBeforePlayerDataInitialize);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnPlayerLoginOk", _m_OnPlayerLoginOk);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "UnInit", _m_UnInit);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "IsSatisfyEquipLevel", _m_IsSatisfyEquipLevel);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetSkillState", _m_GetSkillState);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "TryGetSkillCondition", _m_TryGetSkillCondition);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "TryGetSkillFrames", _m_TryGetSkillFrames);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnReceivePackage", _m_OnReceivePackage);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "skillRefresh", _e_skillRefresh);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "selectSkillRefresh", _e_selectSkillRefresh);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "mySkills", _g_get_mySkills);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "selectSkill", _g_get_selectSkill);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "redpoint", _g_get_redpoint);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "selectSkill", _s_set_selectSkill);
            Utils.EndObjectRegister(type, L, translator, null, null,
                null, null, null);
            Utils.BeginClassRegister(type, L, __CreateInstance, 1, 0, 0);
            Utils.EndClassRegister(type, L, translator);
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int __CreateInstance(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                if(LuaAPI.lua_gettop(L) == 1)
                {
                    Snxxz.UI.JadeDynastySkillModel gen_ret = new Snxxz.UI.JadeDynastySkillModel();
                    translator.Push(L, gen_ret);
                    return 1;
                }
            }
            catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return LuaAPI.luaL_error(L, "invalid arguments to Snxxz.UI.JadeDynastySkillModel constructor!");
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_Init(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                Snxxz.UI.JadeDynastySkillModel gen_to_be_invoked = (Snxxz.UI.JadeDynastySkillModel)translator.FastGetCSObj(L, 1);
                {
                    gen_to_be_invoked.Init(  );
                    return 0;
                }
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_OnBeforePlayerDataInitialize(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                Snxxz.UI.JadeDynastySkillModel gen_to_be_invoked = (Snxxz.UI.JadeDynastySkillModel)translator.FastGetCSObj(L, 1);
                {
                    gen_to_be_invoked.OnBeforePlayerDataInitialize(  );
                    return 0;
                }
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_OnPlayerLoginOk(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                Snxxz.UI.JadeDynastySkillModel gen_to_be_invoked = (Snxxz.UI.JadeDynastySkillModel)translator.FastGetCSObj(L, 1);
                {
                    gen_to_be_invoked.OnPlayerLoginOk(  );
                    return 0;
                }
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_UnInit(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                Snxxz.UI.JadeDynastySkillModel gen_to_be_invoked = (Snxxz.UI.JadeDynastySkillModel)translator.FastGetCSObj(L, 1);
                {
                    gen_to_be_invoked.UnInit(  );
                    return 0;
                }
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_IsSatisfyEquipLevel(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                Snxxz.UI.JadeDynastySkillModel gen_to_be_invoked = (Snxxz.UI.JadeDynastySkillModel)translator.FastGetCSObj(L, 1);
                {
                    int _equipPlace = LuaAPI.xlua_tointeger(L, 2);
                    int _level = LuaAPI.xlua_tointeger(L, 3);
                        bool gen_ret = gen_to_be_invoked.IsSatisfyEquipLevel( _equipPlace, _level );
                        LuaAPI.lua_pushboolean(L, gen_ret);
                    return 1;
                }
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_GetSkillState(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                Snxxz.UI.JadeDynastySkillModel gen_to_be_invoked = (Snxxz.UI.JadeDynastySkillModel)translator.FastGetCSObj(L, 1);
                {
                    int _skillId = LuaAPI.xlua_tointeger(L, 2);
                        Snxxz.UI.JadeDynastySkillState gen_ret = gen_to_be_invoked.GetSkillState( _skillId );
                        translator.Push(L, gen_ret);
                    return 1;
                }
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_TryGetSkillCondition(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                Snxxz.UI.JadeDynastySkillModel gen_to_be_invoked = (Snxxz.UI.JadeDynastySkillModel)translator.FastGetCSObj(L, 1);
                {
                    int _skillId = LuaAPI.xlua_tointeger(L, 2);
                    Snxxz.UI.JadeDynastySkillCondition _condition;
                        bool gen_ret = gen_to_be_invoked.TryGetSkillCondition( _skillId, out _condition );
                        LuaAPI.lua_pushboolean(L, gen_ret);
                    translator.Push(L, _condition);
                    return 2;
                }
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_TryGetSkillFrames(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                Snxxz.UI.JadeDynastySkillModel gen_to_be_invoked = (Snxxz.UI.JadeDynastySkillModel)translator.FastGetCSObj(L, 1);
                {
                    int _skillId = LuaAPI.xlua_tointeger(L, 2);
                    UnityEngine.Sprite[] __sprites;
                        bool gen_ret = gen_to_be_invoked.TryGetSkillFrames( _skillId, out __sprites );
                        LuaAPI.lua_pushboolean(L, gen_ret);
                    translator.Push(L, __sprites);
                    return 2;
                }
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_OnReceivePackage(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                Snxxz.UI.JadeDynastySkillModel gen_to_be_invoked = (Snxxz.UI.JadeDynastySkillModel)translator.FastGetCSObj(L, 1);
                {
                    H0310_tagRoleSkillChange _package = (H0310_tagRoleSkillChange)translator.GetObject(L, 2, typeof(H0310_tagRoleSkillChange));
                    gen_to_be_invoked.OnReceivePackage( _package );
                    return 0;
                }
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_mySkills(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                Snxxz.UI.JadeDynastySkillModel gen_to_be_invoked = (Snxxz.UI.JadeDynastySkillModel)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.mySkills);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_selectSkill(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                Snxxz.UI.JadeDynastySkillModel gen_to_be_invoked = (Snxxz.UI.JadeDynastySkillModel)translator.FastGetCSObj(L, 1);
                LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.selectSkill);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_redpoint(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                Snxxz.UI.JadeDynastySkillModel gen_to_be_invoked = (Snxxz.UI.JadeDynastySkillModel)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.redpoint);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _s_set_selectSkill(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                Snxxz.UI.JadeDynastySkillModel gen_to_be_invoked = (Snxxz.UI.JadeDynastySkillModel)translator.FastGetCSObj(L, 1);
                gen_to_be_invoked.selectSkill = LuaAPI.xlua_tointeger(L, 2);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 0;
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _e_skillRefresh(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                int gen_param_count = LuaAPI.lua_gettop(L);
            Snxxz.UI.JadeDynastySkillModel gen_to_be_invoked = (Snxxz.UI.JadeDynastySkillModel)translator.FastGetCSObj(L, 1);
                System.Action<int> gen_delegate = translator.GetDelegate<System.Action<int>>(L, 3);
                if (gen_delegate == null) {
                    return LuaAPI.luaL_error(L, "#3 need System.Action<int>!");
                }
                if (gen_param_count == 3)
                {
                    if (LuaAPI.xlua_is_eq_str(L, 2, "+")) {
                        gen_to_be_invoked.skillRefresh += gen_delegate;
                        return 0;
                    }
                    if (LuaAPI.xlua_is_eq_str(L, 2, "-")) {
                        gen_to_be_invoked.skillRefresh -= gen_delegate;
                        return 0;
                    }
                }
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            LuaAPI.luaL_error(L, "invalid arguments to Snxxz.UI.JadeDynastySkillModel.skillRefresh!");
            return 0;
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _e_selectSkillRefresh(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                int gen_param_count = LuaAPI.lua_gettop(L);
            Snxxz.UI.JadeDynastySkillModel gen_to_be_invoked = (Snxxz.UI.JadeDynastySkillModel)translator.FastGetCSObj(L, 1);
                System.Action<int> gen_delegate = translator.GetDelegate<System.Action<int>>(L, 3);
                if (gen_delegate == null) {
                    return LuaAPI.luaL_error(L, "#3 need System.Action<int>!");
                }
                if (gen_param_count == 3)
                {
                    if (LuaAPI.xlua_is_eq_str(L, 2, "+")) {
                        gen_to_be_invoked.selectSkillRefresh += gen_delegate;
                        return 0;
                    }
                    if (LuaAPI.xlua_is_eq_str(L, 2, "-")) {
                        gen_to_be_invoked.selectSkillRefresh -= gen_delegate;
                        return 0;
                    }
                }
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            LuaAPI.luaL_error(L, "invalid arguments to Snxxz.UI.JadeDynastySkillModel.selectSkillRefresh!");
            return 0;
        }
    }
}
Lua/Gen/SnxxzUIJadeDynastySkillModelWrap.cs.meta
New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: aaf543a659c2c984a9809b27100037e9
timeCreated: 1548250966
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData:
  assetBundleName:
  assetBundleVariant:
Lua/Gen/SnxxzUIRankModelWrap.cs
@@ -21,16 +21,20 @@
        {
            ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            System.Type type = typeof(Snxxz.UI.RankModel);
            Utils.BeginObjectRegister(type, L, translator, 0, 2, 2, 1);
            Utils.BeginObjectRegister(type, L, translator, 0, 4, 3, 2);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnPlayerLoginOk", _m_OnPlayerLoginOk);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "UnInit", _m_UnInit);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "SendBegRank", _m_SendBegRank);
            
            
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "rankType", _g_get_rankType);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "rankList", _g_get_rankList);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "jumpRankType", _g_get_jumpRankType);
            
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "rankType", _s_set_rankType);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "jumpRankType", _s_set_jumpRankType);
            
            
            Utils.EndObjectRegister(type, L, translator, null, null,
@@ -104,6 +108,33 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_OnPlayerLoginOk(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                Snxxz.UI.RankModel gen_to_be_invoked = (Snxxz.UI.RankModel)translator.FastGetCSObj(L, 1);
                {
                    gen_to_be_invoked.OnPlayerLoginOk(  );
                    return 0;
                }
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_UnInit(RealStatePtr L)
        {
            try {
@@ -118,6 +149,34 @@
                {
                    
                    gen_to_be_invoked.UnInit(  );
                    return 0;
                }
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_SendBegRank(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                Snxxz.UI.RankModel gen_to_be_invoked = (Snxxz.UI.RankModel)translator.FastGetCSObj(L, 1);
                {
                    PlayerRankData.RankType _rankType;translator.Get(L, 2, out _rankType);
                    gen_to_be_invoked.SendBegRank( _rankType );
                    
                    
                    
@@ -161,6 +220,20 @@
            return 1;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_jumpRankType(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                Snxxz.UI.RankModel gen_to_be_invoked = (Snxxz.UI.RankModel)translator.FastGetCSObj(L, 1);
                LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.jumpRankType);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
@@ -178,6 +251,21 @@
            return 0;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _s_set_jumpRankType(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                Snxxz.UI.RankModel gen_to_be_invoked = (Snxxz.UI.RankModel)translator.FastGetCSObj(L, 1);
                gen_to_be_invoked.jumpRankType = LuaAPI.xlua_tointeger(L, 2);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 0;
        }
        
        
        
Lua/Gen/XLuaGenAutoRegister.cs
@@ -453,6 +453,9 @@
            translator.DelayWrapLoader(typeof(Snxxz.UI.JadeDynastyBossModel), SnxxzUIJadeDynastyBossModelWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.JadeDynastySkillModel), SnxxzUIJadeDynastySkillModelWrap.__Register);
            translator.DelayWrapLoader(typeof(Snxxz.UI.FBHelpPointExchageModel), SnxxzUIFBHelpPointExchageModelWrap.__Register);
        
        
@@ -485,13 +488,13 @@
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.KingTreasureShowModel), SnxxzUIKingTreasureShowModelWrap.__Register);
        
            translator.DelayWrapLoader(typeof(KnapSackEventMgr), KnapSackEventMgrWrap.__Register);
        }
        
        static void wrapInit3(LuaEnv luaenv, ObjectTranslator translator)
        {
            translator.DelayWrapLoader(typeof(KnapSackEventMgr), KnapSackEventMgrWrap.__Register);
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.LoginModel), SnxxzUILoginModelWrap.__Register);
        
@@ -642,13 +645,13 @@
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.RuneModel), SnxxzUIRuneModelWrap.__Register);
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.RuneTowerModel), SnxxzUIRuneTowerModelWrap.__Register);
        }
        
        static void wrapInit4(LuaEnv luaenv, ObjectTranslator translator)
        {
            translator.DelayWrapLoader(typeof(Snxxz.UI.RuneTowerModel), SnxxzUIRuneTowerModelWrap.__Register);
        
            translator.DelayWrapLoader(typeof(QuickSetting), QuickSettingWrap.__Register);
        
@@ -799,14 +802,14 @@
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.ModelCenter), SnxxzUIModelCenterWrap.__Register);
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.WindowCenter), SnxxzUIWindowCenterWrap.__Register);
        }
        
        static void wrapInit5(LuaEnv luaenv, ObjectTranslator translator)
        {
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.WindowCenter), SnxxzUIWindowCenterWrap.__Register);
            translator.DelayWrapLoader(typeof(WindowJumpMgr), WindowJumpMgrWrap.__Register);
        
        
Lua/Gen/link.xml
@@ -123,6 +123,7 @@
        <type fullname="HeavenBattleModel" preserve="all"/>
        <type fullname="HttpRequest" preserve="all"/>
        <type fullname="Snxxz.UI.JadeDynastyBossModel" preserve="all"/>
        <type fullname="Snxxz.UI.JadeDynastySkillModel" preserve="all"/>
        <type fullname="Snxxz.UI.FBHelpPointExchageModel" preserve="all"/>
        <type fullname="Snxxz.UI.KnapsackTimeCDMgr" preserve="all"/>
        <type fullname="Snxxz.UI.BoxGetItemModel" preserve="all"/>
System/Compose/New/ComposeEquipWin.cs
@@ -708,8 +708,11 @@
        private void SetFixedItemIndexDic()
        {
            fixedItemIndexDict.Clear();
            SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);
            if (singlePack == null || compoundModel == null) return;
            if (compoundModel == null) return;
            var packType = composeWinModel.GetPackTypeByMakerId(compoundModel.makeID);
            SinglePackModel singlePack = playerPack.GetSinglePackModel(packType);
            if (singlePack == null) return;
            int minBindCnt = 0;
            int minNoBindCnt = 0;
System/Compose/New/ComposeMatCell.cs
@@ -36,7 +36,8 @@
        public void SetDisplay(ItemCompoundConfig _itemCompound,NeedMatType _matType,bool isLock,string des = "", int _itemId = 0,int _itemIndex = -1)
        {
            this.itemCompound = _itemCompound;
            this.itemModel = playerPack.GetItemModelByIndex(PackType.rptItem, _itemIndex);
            var packType = composeModel.GetPackTypeByMakerId(itemCompound.makeID);
            this.itemModel = playerPack.GetItemModelByIndex(packType, _itemIndex);
            this.matType = _matType;
            this.itemId = _itemId;
            matDes = des;
@@ -98,7 +99,8 @@
                case NeedMatType.fixedItem:
                    int needCount = 0;
                    TryGetCountById(out needCount);
                    int haveCount = playerPack.GetItemCountByID(PackType.rptItem, itemId);
                    var packType = composeModel.GetPackTypeByMakerId(itemCompound.makeID);
                    int haveCount = playerPack.GetItemCountByID(packType, itemId);
                    itemCell.countText.gameObject.SetActive(true);
                    if (haveCount >= needCount)
                    {
System/Compose/New/ComposeTicketWin.cs
@@ -468,12 +468,13 @@
            }
            List<int> composeCountlist = new List<int>();
            SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);
            var packType = composeWinModel.GetPackTypeByMakerId(compoundModel.makeID);
            SinglePackModel singlePack = playerPack.GetSinglePackModel(packType);
            int[] fixedIds = compoundModel.itemID;
            int[] fixedCounts = compoundModel.itemCount;
            for (int i = 0; i < fixedIds.Length; i++)
            {
                int haveCount = playerPack.GetItemCountByID(PackType.rptItem, fixedIds[i]);
                int haveCount = playerPack.GetItemCountByID(packType, fixedIds[i]);
                int canComposeCount = haveCount / fixedCounts[i];
                composeCountlist.Add(canComposeCount);
                List<int> itemIndexlist = null;
@@ -515,8 +516,10 @@
        private void SetFixedItemIndexDic()
        {
            fixedItemIndexDict.Clear();
            SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);
            if (singlePack == null || compoundModel == null) return;
            if (compoundModel == null) return;
            var packType = composeWinModel.GetPackTypeByMakerId(compoundModel.makeID);
            SinglePackModel singlePack = playerPack.GetSinglePackModel(packType);
            if (singlePack == null) return;
            int minBindCnt = 0;
            int minNoBindCnt = 0;
System/Compose/New/ComposeToolsWin.cs
@@ -450,8 +450,10 @@
        private void SetFixedItemIndexDic()
        {
            fixedItemIndexDict.Clear();
            SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);
            if (singlePack == null || compoundModel == null) return;
            if (compoundModel == null) return;
            var packType = composeWinModel.GetPackTypeByMakerId(compoundModel.makeID);
            SinglePackModel singlePack = playerPack.GetSinglePackModel(packType);
            if (singlePack == null) return;
            int minBindCnt = 0;
            int minNoBindCnt = 0;
@@ -495,13 +497,14 @@
            List<int> composeCountlist = new List<int>();
            fixedItemIndexDict.Clear();
            SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);
            var packType = composeWinModel.GetPackTypeByMakerId(compoundModel.makeID);
            SinglePackModel singlePack = playerPack.GetSinglePackModel(packType);
            int[] fixedIds = compoundModel.itemID;
            int[] fixedCounts = compoundModel.itemCount;
            for (int i = 0; i < fixedIds.Length; i++)
            {
                int haveCount = playerPack.GetItemCountByID(PackType.rptItem,fixedIds[i]);
                int haveCount = playerPack.GetItemCountByID(packType,fixedIds[i]);
                int canComposeCount = haveCount / fixedCounts[i];
                composeCountlist.Add(canComposeCount);
                List<int> itemIndexlist = null;
System/Compose/New/ComposeWinModel.cs
@@ -417,6 +417,16 @@
    }
    #endregion
    public PackType GetPackTypeByMakerId(int[] makeIds)
    {
        if (makeIds == null || makeIds.Length < 1) return PackType.rptDeleted;
        int makeId = makeIds[0];
        var itemConfig = Config.Instance.Get<ItemConfig>(makeId);
        return GeneralDefine.GetPackTypeByItemType(itemConfig.Type);
    }
    public void SetUpdateSendComposeEvent()
    {
        if(UpdateSendComposeEvent != null)
@@ -522,12 +532,12 @@
            MessageWin.Inst.ShowFixedTip(Language.Get("Compose101"));
            return;
        }
        var packType = GetPackTypeByMakerId(compoundModel.makeID);
        int[] fixedIds = compoundModel.itemID;
        int[] fixedCounts = compoundModel.itemCount;
        for (i = 0; i < fixedCounts.Length; i++)
        {
            int haveCount = playerPack.GetItemCountByID(PackType.rptItem,fixedIds[i]);
            int haveCount = playerPack.GetItemCountByID(packType, fixedIds[i]);
            if (haveCount < fixedCounts[i])
            {
                ItemConfig fixedConfig = Config.Instance.Get<ItemConfig>(fixedIds[i]);
@@ -570,7 +580,7 @@
        {
            for(i= 0; i < fixedIndexArray.Length;i++ )
            {
                ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.rptItem,fixedIndexArray[i]);
                ItemModel itemModel = playerPack.GetItemModelByIndex(packType, fixedIndexArray[i]);
                SetMatIsBindDict(itemModel,fixedMatIsBindDict);
            }
        }
@@ -588,7 +598,7 @@
        {
            for (i = 0; i < unfixedIndexArray.Length; i++)
            {
                ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.rptItem, unfixedIndexArray[i]);
                ItemModel itemModel = playerPack.GetItemModelByIndex(packType, unfixedIndexArray[i]);
                SetMatIsBindDict(itemModel,unfixedMatIsBindDict);
            }
        }
System/Compose/New/ComposeWingsWin.cs
@@ -478,8 +478,10 @@
        private bool ChangeFixedMatUI()
        {
            SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);
            if (singlePack == null || compoundModel == null) return false;
            if (compoundModel == null) return false;
            var packType = composeWinModel.GetPackTypeByMakerId(compoundModel.makeID);
            SinglePackModel singlePack = playerPack.GetSinglePackModel(packType);
            if (singlePack == null) return false;
            bool isBind = false;
            Dictionary<int,ItemModel> unfixedMatDict = selectModel.GetHaveUnfixedSelectItem();
@@ -605,8 +607,10 @@
        private void SetFixedMatIndex()
        {
            fixedItemIndexDict.Clear();
            SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);
            if (singlePack == null || compoundModel == null) return;
            if (compoundModel == null) return;
            var packType = composeWinModel.GetPackTypeByMakerId(compoundModel.makeID);
            SinglePackModel singlePack = playerPack.GetSinglePackModel(packType);
            if (singlePack == null) return;
            int isBind = 0;
            if(IsComposeBind)
System/Compose/New/SelectEquipModel.cs
@@ -56,9 +56,11 @@
    public Dictionary<int, ItemModel> GetUnfixedItemModel()
    {
        SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);
        if (singlePack == null || composeWinModel.CurComposeModel == null)
            return null;
        if (composeWinModel.CurComposeModel == null) return null;
        var packType = composeWinModel.GetPackTypeByMakerId(composeWinModel.CurComposeModel.makeID);
        SinglePackModel singlePack = playerPack.GetSinglePackModel(packType);
        if (singlePack == null) return null;
        int[] unfixedIds = composeWinModel.CurComposeModel.unfixedItemID;
        allBagItemInfo = singlePack.GetPackModelIndexDict();
@@ -96,9 +98,10 @@
    public Dictionary<int, ItemModel> GetAddItemModel()
    {
        SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);
        if (singlePack == null)
            return null;
        if (composeWinModel.CurComposeModel == null) return null;
        var packType = composeWinModel.GetPackTypeByMakerId(composeWinModel.CurComposeModel.makeID);
        SinglePackModel singlePack = playerPack.GetSinglePackModel(packType);
        if (singlePack == null) return null;
        allBagItemInfo = singlePack.GetPackModelIndexDict();
        List<ItemModel> modellist = allBagItemInfo.Values.ToList();
@@ -215,7 +218,10 @@
    public void AddHaveUnfixedSelectItem(int itemPlace)
    {
        ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.rptItem, itemPlace);
        if (composeWinModel.CurComposeModel == null) return;
        var packType = composeWinModel.GetPackTypeByMakerId(composeWinModel.CurComposeModel.makeID);
        ItemModel itemModel = playerPack.GetItemModelByIndex(packType, itemPlace);
        if (!haveUnfixedSelectItemDic.ContainsKey(itemPlace))
        {
            haveUnfixedSelectItemDic.Add(itemPlace, itemModel);
@@ -232,7 +238,9 @@
    public void AddHaveAddSelectItem(int itemPlace)
    {
        ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.rptItem, itemPlace);
        if (composeWinModel.CurComposeModel == null) return;
        var packType = composeWinModel.GetPackTypeByMakerId(composeWinModel.CurComposeModel.makeID);
        ItemModel itemModel = playerPack.GetItemModelByIndex(packType, itemPlace);
        if (!haveAddSelectItemDic.ContainsKey(itemPlace))
        {
            haveAddSelectItemDic.Add(itemPlace, itemModel);
System/DogzDungeon/DogzDungeonModel.cs
@@ -54,7 +54,8 @@
                if (m_BigBoxCollectCount != value)
                {
                    m_BigBoxCollectCount = value;
                    UpdateRedpoint();
                    UpdateRedpoint();
                    crossServerBossModel.UpdateRedpoint();
                    if (bigBoxCollectCountChangeEvent != null)
                    {
                        bigBoxCollectCountChangeEvent();
System/Dungeon/DungeonFightWin.cs
@@ -437,25 +437,7 @@
                case JadeDynastyTowerModel.DATA_MAPID:
                    var jadeDynastyTowerModel = ModelCenter.Instance.GetModel<JadeDynastyTowerModel>();
                    jadeDynastyTowerModel.RequestAward();
                    if (model.dungeonResult.grade == 5)
                    {
                        if (!jadeDynastyTowerModel.IsTopFloor(jadeDynastyTowerModel.currentFloor))
                        {
                            var dungeonStage = StageManager.Instance.CurrentStage as JadeDynastyTowerDungeonStage;
                            dungeonStage.PerformChallengeNextLevel();
                            model.UpdateCoolDown(DungeonCoolDownType.LeaveMap, 0);
                            model.UpdateCoolDown(DungeonCoolDownType.TowerTake, 0);
                        }
                        else
                        {
                            model.ExitCurrentDungeon();
                        }
                    }
                    else
                    {
                        model.ExitCurrentDungeon();
                    }
                    model.ExitCurrentDungeon();
                    WindowCenter.Instance.Close<JadyDynastyTowerVictoryWin>();
                    break;
                default:
System/FriendSystem/MailPanel.cs
@@ -623,69 +623,109 @@
        CreateMailCell();
    }
    private Dictionary<PackType, int> GetPackItemDcit = new Dictionary<PackType, int>();
    public void SendAskReceive(string id)
    {
        MailInfo mailInfo = MailAllModel.Instance.GetMailInfo(id);
        if (mailInfo == null) return;
        GetPackItemDcit.Clear();
        int i = 0;
        int getBagItemCount = 0;
        int getRuneCount = 0;
        int getDogzCount = 0;
        int getSoulCount = 0;
        //int getBagItemCount = 0;
        //int getRuneCount = 0;
        //int getDogzCount = 0;
        //int getSoulCount = 0;
        ItemConfig tagChinItem = null;
        //for (i = 0; i < mailInfo.Count; i++)
        //{
        //    tagChinItem = Config.Instance.Get<ItemConfig>((int)mailInfo.Items[i].ItemID);
        //    if (tagChinItem != null)
        //    {
        //        var packType = GeneralDefine.GetPackTypeByItemType(tagChinItem.Type);
        //        if(!GetPackItemDcit.ContainsKey(packType))
        //        {
        //            GetPackItemDcit.Add(packType,1);
        //        }
        //        else
        //        {
        //            GetPackItemDcit[packType]
        //        }
        //        switch(tagChinItem.Type)
        //        {
        //            case RuneModel.RUNE_TYPE:
        //            case  RuneModel.RUNE_CREAMTYPE:
        //                 getRuneCount += 1;
        //                break;
        //            case (int)ItemType.DogzStrengthMat:
        //            case (int)ItemType.DogzEquipType1:
        //            case (int)ItemType.DogzEquipType2:
        //            case (int)ItemType.DogzEquipType3:
        //            case (int)ItemType.DogzEquipType4:
        //            case (int)ItemType.DogzEquipType5:
        //                getDogzCount += 1;
        //                break;
        //            case GatheringSoulModel.GATHERSOUL_CORE_TYPE:
        //            case GatheringSoulModel.GATHERSOUL_ESSENCE_TYPE:
        //            case GatheringSoulModel.GATHERSOUL_SOUL_TYPE:
        //                getSoulCount += 1;
        //                break;
        //            default:
        //                getBagItemCount += 1;
        //                break;
        //        }
        //    }
        //}
        for (i = 0; i < mailInfo.Count; i++)
        {
            tagChinItem = Config.Instance.Get<ItemConfig>((int)mailInfo.Items[i].ItemID);
            if (tagChinItem != null)
            {
                switch(tagChinItem.Type)
                var packType = GeneralDefine.GetPackTypeByItemType(tagChinItem.Type);
                if (!GetPackItemDcit.ContainsKey(packType))
                {
                    case RuneModel.RUNE_TYPE:
                    case  RuneModel.RUNE_CREAMTYPE:
                         getRuneCount += 1;
                        break;
                    case (int)ItemType.DogzStrengthMat:
                    case (int)ItemType.DogzEquipType1:
                    case (int)ItemType.DogzEquipType2:
                    case (int)ItemType.DogzEquipType3:
                    case (int)ItemType.DogzEquipType4:
                    case (int)ItemType.DogzEquipType5:
                        getDogzCount += 1;
                        break;
                    case GatheringSoulModel.GATHERSOUL_CORE_TYPE:
                    case GatheringSoulModel.GATHERSOUL_ESSENCE_TYPE:
                    case GatheringSoulModel.GATHERSOUL_SOUL_TYPE:
                        getSoulCount += 1;
                        break;
                    default:
                        getBagItemCount += 1;
                        break;
                    GetPackItemDcit.Add(packType, 1);
                }
                else
                {
                    GetPackItemDcit[packType] += 1;
                }
            }
        }
        if (getBagItemCount > playerPack.GetReaminGridCount(PackType.rptItem))
        foreach (var key in GetPackItemDcit.Keys)
        {
            SysNotifyMgr.Instance.ShowTip("BagFull");
            return;
            int remainCount = playerPack.GetReaminGridCount(key);
            int getCount = GetPackItemDcit[key];
            if(remainCount < getCount)
            {
                SysNotifyMgr.Instance.ShowTip("GeRen_chenxin_676165",key);
                return;
            }
        }
        else if (getRuneCount > runeModel.SurplusRunePackCnt)
        {
            SysNotifyMgr.Instance.ShowTip("RuneBagFull");
            return;
        }
        else if(getDogzCount > playerPack.GetReaminGridCount(PackType.rptDogzItem))
        {
            SysNotifyMgr.Instance.ShowTip("DogzBagFull");
            return;
        }
        else if(getSoulCount > virtualPackModel.GetPackRemainCount(PackType.rptGatherSoul))
        {
            SysNotifyMgr.Instance.ShowTip("GeRen_chenxin_676165",PackType.rptGatherSoul);
            return;
        }
        //if (getBagItemCount > playerPack.GetReaminGridCount(PackType.rptItem))
        //{
        //    SysNotifyMgr.Instance.ShowTip("BagFull");
        //    return;
        //}
        //else if (getRuneCount > runeModel.SurplusRunePackCnt)
        //{
        //    SysNotifyMgr.Instance.ShowTip("RuneBagFull");
        //    return;
        //}
        //else if(getDogzCount > playerPack.GetReaminGridCount(PackType.rptDogzItem))
        //{
        //    SysNotifyMgr.Instance.ShowTip("DogzBagFull");
        //    return;
        //}
        //else if(getSoulCount > virtualPackModel.GetPackRemainCount(PackType.rptGatherSoul))
        //{
        //    SysNotifyMgr.Instance.ShowTip("GeRen_chenxin_676165",PackType.rptGatherSoul);
        //    return;
        //}
        CA53B_tagCMRequestCompensation askRecive = new CA53B_tagCMRequestCompensation();
        askRecive.GUID = id;
System/GeneralConfig/GeneralDefine.cs
@@ -138,7 +138,7 @@
    public static Dictionary<int, int> fairyGrabBossMapLines { get; private set; }
    public static Dictionary<int, List<int>> DropItemEffectMapID { get; private set; }
    public static Dictionary<int, List<int>> itemPutInPackDict { get; private set; }
    public static List<int> RebornAutoFightMapID { get; private set; }
    public static string teamWorldCall;
@@ -278,6 +278,25 @@
                _pos[0] = (double)_data[_key][0];
                _pos[1] = (double)_data[_key][1];
                NpcPosOffset.Add(_npcID, new Vector3((float)_pos[0], 0, (float)_pos[1]));
            }
            var putInItemPack = Config.Instance.Get<FuncConfigConfig>("PutInItemPack");
            LitJson.JsonData itemPutInData = LitJson.JsonMapper.ToObject(putInItemPack.Numerical1);
            itemPutInPackDict = new Dictionary<int, List<int>>();
            foreach(var _key in itemPutInData.Keys)
            {
                var itemTypeData = itemPutInData[_key];
                int packType = int.Parse(_key);
                List<int> itemTypes = new List<int>();
                itemPutInPackDict.Add(packType,itemTypes);
                if(itemTypeData.IsArray)
                {
                    for (i = 0; i < itemTypeData.Count; i++)
                    {
                        int itemType = int.Parse(itemTypeData[i].ToString());
                        itemTypes.Add(itemType);
                    }
                }
            }
            FuncConfigConfig nxxdImg = Config.Instance.Get<FuncConfigConfig>("NXXDPicture");
@@ -689,6 +708,19 @@
        }
    }
    public static PackType GetPackTypeByItemType(int itemType)
    {
        foreach(var key in itemPutInPackDict.Keys)
        {
            var types = itemPutInPackDict[key];
            if(types.Contains(itemType))
            {
                return (PackType)key;
            }
        }
        return PackType.rptItem;
    }
    private static int GetInt(string _key, int _index = 1)
    {
        var result = 0;
System/JadeDynastyBoss/JadeDynastyBossModel.cs
@@ -126,6 +126,7 @@
                            realmLevel = config.RealmLV,
                            score = config.ZhuXianScore,
                        },
                        conditionSorts = new List<int>(config.conditionSorts),
                    });
                    var itemArray = LitJson.JsonMapper.ToObject<int[][]>(config.dropItems);
@@ -170,7 +171,35 @@
            });
            if (index != -1)
            {
                var boss = jadeDynastyBosses[index];
                var challengeCondition = jadeDynastyBosses[index].challengeCondition;
                foreach (var code in boss.conditionSorts)
                {
                    switch (code)
                    {
                        case 1:
                            if (PlayerDatas.Instance.baseData.LV < challengeCondition.level)
                            {
                                condition = 1;
                                return false;
                            }
                            break;
                        case 2:
                            if (PlayerDatas.Instance.baseData.realmLevel < challengeCondition.realmLevel)
                            {
                                condition = 2;
                                return false;
                            }
                            break;
                        case 3:
                            if (jadeDynastyScore < (ulong)challengeCondition.score)
                            {
                                condition = 3;
                                return false;
                            }
                            break;
                    }
                }
                if (PlayerDatas.Instance.baseData.LV < challengeCondition.level)
                {
                    condition = 1;
@@ -481,6 +510,7 @@
        public int bossNpcId;
        public int lineId;
        public JadeDynastyBossCondition challengeCondition;
        public List<int> conditionSorts;
    }
    public struct JadeDynastyBossCondition
System/JadeDynastyBoss/JadeDynastyBossVictoryWin.cs
@@ -186,16 +186,16 @@
            {
                return -islhsJadeDynastyEquip.CompareTo(isrhsJadeDynastyEquip);
            }
            var islhsJadeDynasty126 = IsJadeDynasty126(_lhs);
            var isrhsJadeDynasty126 = IsJadeDynasty126(_rhs);
            if (islhsJadeDynasty126 == isrhsJadeDynasty126
                && islhsJadeDynasty126)
            var islhsJadeDynasty138 = IsJadeDynasty138(_lhs);
            var isrhsJadeDynasty138 = IsJadeDynasty138(_rhs);
            if (islhsJadeDynasty138 == isrhsJadeDynasty138
                && islhsJadeDynasty138)
            {
                return _lhs.id.CompareTo(_rhs.id);
            }
            else if (islhsJadeDynasty126 != isrhsJadeDynasty126)
            else if (islhsJadeDynasty138 != isrhsJadeDynasty138)
            {
                return -islhsJadeDynasty126.CompareTo(isrhsJadeDynasty126);
                return -islhsJadeDynasty138.CompareTo(isrhsJadeDynasty138);
            }
            var lhsConfig = Config.Instance.Get<ItemConfig>(_lhs.id);
            var rhsConfig = Config.Instance.Get<ItemConfig>(_rhs.id);
@@ -217,7 +217,7 @@
            return type >= 128 && type <= 137;
        }
        bool IsJadeDynasty126(Item item)
        bool IsJadeDynasty138(Item item)
        {
            var config = Config.Instance.Get<ItemConfig>(item.id);
            var type = 0;
@@ -225,7 +225,7 @@
            {
                type = config.Type;
            }
            return type == 126;
            return type == 138;
        }
        private void GenerateRewardBehaviour(RectTransform _parent, int _needCount)
System/JadeDynastyKnapSack/JadeDynastyDecomposeLineBeh.cs
@@ -41,12 +41,15 @@
        {
            [SerializeField] CommonItemBaisc itemBaisc;
            [SerializeField] GameObject selectObj;
            [SerializeField] GameObject equipLvObj;
            [SerializeField] Text equipLvText;
            JadeDynastyDecomposeModel decomposeModel { get { return ModelCenter.Instance.GetModel<JadeDynastyDecomposeModel>(); } }
            public void SetDisplay(ItemModel itemModel,List<string> selectGuids)
            {
                itemBaisc.cellBtn.RemoveAllListeners();
                equipLvObj.SetActive(false);
                if (itemModel == null || selectGuids == null)
                {
                    itemBaisc.gameObject.SetActive(false);
@@ -57,6 +60,12 @@
                    itemBaisc.gameObject.SetActive(true);
                    selectObj.SetActive(selectGuids.Contains(itemModel.itemInfo.ItemGUID));
                    itemBaisc.Init(itemModel,true);
                    if(itemModel.chinItemModel.EquipPlace > 0)
                    {
                        equipLvObj.SetActive(true);
                        string equipLvSB = Language.Get(StringUtility.Contact("Num_CHS_", itemModel.chinItemModel.LV));
                        equipLvText.text = Language.Get("L1091", equipLvSB);
                    }
                    itemBaisc.cellBtn.AddListener(()=>
                    {
                        if (selectObj.activeInHierarchy)
System/JadeDynastyKnapSack/JadeDynastyDecomposeModel.cs
@@ -14,7 +14,6 @@
        public List<string> selectGuids { get; private set; }
        public List<string> allGuids { get; private set; }
        public event Action UpdateSelectItemEvent;
        PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }
        PackModelInterface modelInterface { get { return ModelCenter.Instance.GetModel<PackModelInterface>(); } }
System/JadeDynastyKnapSack/JadeDynastyEquipBeh.cs
@@ -12,6 +12,9 @@
        [SerializeField] Text lockText;
        [SerializeField] Text nameText;
        [SerializeField] Button equipBtn;
        [SerializeField] GameObject equipLvObj;
        [SerializeField] Text equipLvText;
        [SerializeField] GameObject composeImg;
        ItemTipsModel tipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }
        PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }
@@ -33,15 +36,18 @@
        public void SetDisplay()
        {
            bool islock = equipModel.IsLockEquipPlace((int)equipType);
            nameText.gameObject.SetActive(true);
            nameText.text = Language.Get(equipType.ToString());
            lockText.gameObject.SetActive(false);
            nameText.gameObject.SetActive(false);
            lockObj.SetActive(islock);
            equipBtn.RemoveAllListeners();
            itemCell.cellBtn.RemoveAllListeners();
            equipLvObj.SetActive(false);
            composeImg.SetActive(false);
            if(islock)
            {
                itemCell.gameObject.SetActive(false);
                equipBtn.AddListener(ClickEquipBtn);
            }
            else
            {
@@ -49,10 +55,27 @@
                itemCell.gameObject.SetActive(itemModel != null);
                if (itemModel != null)
                {
                    equipLvObj.SetActive(true);
                    nameText.gameObject.SetActive(false);
                    itemCell.Init(itemModel);
                    itemCell.cellBtn.AddListener(() => { ClickItemCell(itemModel); });
                    string equipLvSB = Language.Get(StringUtility.Contact("Num_CHS_", itemModel.chinItemModel.LV));
                    equipLvText.text = Language.Get("L1091",equipLvSB);
                }
                else
                {
                    equipBtn.AddListener(ClickEquipBtn);
                    if (equipModel.equipPlaceComposes.Contains((int)equipType))
                    {
                        composeImg.SetActive(true);
                    }
                }
            }
        }
        private void ClickEquipBtn()
        {
            equipModel.SetLookEquipGetPath((int)equipType);
        }
        private void PutOffEquip(PackType type, int index, int id)
@@ -79,7 +102,7 @@
            if (item == null) return;
            tipsModel.SetItemTipsModel(item.packType,item.itemInfo.ItemGUID,false);
            tipsModel.SetPutOnTipsBtn(tipsModel.curAttrData);
            tipsModel.SetJadeDynastyPutOnTipsBtn(tipsModel.curAttrData);
            tipsModel.ShowUICtrl();
        }
    }
System/JadeDynastyKnapSack/JadeDynastyEquipGetPathsWin.cs
New file
@@ -0,0 +1,154 @@
using System;
using UnityEngine;
using UnityEngine.UI;
using System.Collections.Generic;
using TableConfig;
using System.Collections;
namespace Snxxz.UI
{
    public class JadeDynastyEquipGetPathsWin : Window
    {
        [SerializeField] RectTransform container;
        [SerializeField] CanvasGroup alpha;
        [SerializeField] List<Path> paths = new List<Path>();
        JadeDynastyEquipModel equipModel { get { return ModelCenter.Instance.GetModel<JadeDynastyEquipModel>(); } }
        #region Built-in
        protected override void BindController()
        {
        }
        protected override void AddListeners()
        {
        }
        protected override void OnPreOpen()
        {
            SetDisplay();
        }
        protected override void OnActived()
        {
            base.OnActived();
            StartCoroutine(DelayShow());
        }
        protected override void OnAfterOpen()
        {
        }
        protected override void OnPreClose()
        {
        }
        protected override void OnAfterClose()
        {
        }
        #endregion
        private void SetDisplay()
        {
            alpha.alpha = 0;
            container.gameObject.SetActive(false);
            UpdatePath();
        }
        IEnumerator DelayShow()
        {
            yield return null;
            container.gameObject.SetActive(true);
            container.localPosition = equipModel.targetPos;
            StartCoroutine(DelayAlpha());
        }
        IEnumerator DelayAlpha()
        {
            yield return null;
            alpha.alpha = 1;
        }
        private void UpdatePath()
        {
            bool isLock = equipModel.IsLockEquipPlace(equipModel.targetEquipPlace);
            if(isLock)
            {
                int towerLayer = 0;
                equipModel.TryGetLockTowerLayer(equipModel.targetEquipPlace,out towerLayer);
                for (int i = 0; i < paths.Count; i++)
                {
                    var path = paths[i];
                    if(i == 0)
                    {
                        path.pathObj.SetActive(true);
                        path.SetDisPlay(0,towerLayer);
                    }
                    else
                    {
                        path.pathObj.SetActive(false);
                    }
                }
            }
            else
            {
                List<int> pathIds = null;
                bool isPath = equipModel.TryGetEquipPaths(equipModel.targetEquipPlace,out pathIds);
                if(isPath)
                {
                    for(int i = 0; i < paths.Count; i++)
                    {
                        var path = paths[i];
                        if(i < pathIds.Count)
                        {
                            var pathId = pathIds[i];
                            path.pathObj.SetActive(true);
                            path.SetDisPlay(pathId,0);
                        }
                        else
                        {
                            path.pathObj.SetActive(false);
                        }
                    }
                }
            }
        }
        [Serializable]
        public class Path
        {
            [SerializeField] public GameObject pathObj;
            [SerializeField] Text pathText;
            [SerializeField] Button pathBtn;
            public void SetDisPlay(int pathId,int towerLayer)
            {
                pathBtn.RemoveAllListeners();
                if (towerLayer == 0)
                {
                    var pathConfig = Config.Instance.Get<GetItemWaysConfig>(pathId);
                    if (pathConfig == null) return;
                    pathText.text = pathConfig.name;
                    pathBtn.AddListener(()=>
                    {
                        WindowCenter.Instance.CloseImmediately<JadeDynastyEquipGetPathsWin>();
                        WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)pathConfig.OpenpanelId);
                    });
                }
                else
                {
                    pathText.text = Language.Get("JadeDynastyEquip2",towerLayer);
                    pathBtn.AddListener(() =>
                    {
                        WindowCenter.Instance.CloseImmediately<JadeDynastyEquipGetPathsWin>();
                        WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.JadeDynastyTower288);
                    });
                }
            }
        }
    }
}
System/JadeDynastyKnapSack/JadeDynastyEquipGetPathsWin.cs.meta
New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 2f33faa6ffe19c3488cdb1f273751e8c
timeCreated: 1548247759
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData:
  assetBundleName:
  assetBundleVariant:
System/JadeDynastyKnapSack/JadeDynastyEquipModel.cs
@@ -4,6 +4,7 @@
using System.Text;
using TableConfig;
using LitJson;
using UnityEngine;
namespace Snxxz.UI
{
@@ -21,6 +22,7 @@
        {
            ParseFuncConfig();
            ParseSuitAttrConfig();
            ParseTowerConfig();
        }
        public void OnBeforePlayerDataInitialize()
@@ -46,19 +48,12 @@
        #region 解析表数据
        public Dictionary<int, int> lockEquipLayerDict { get; private set; }
        public Dictionary<int, List<int>> suitTypeDict { get; private set;}
        public Dictionary<int, List<int>> equipGetPathDict { get; private set;}
        public List<int> equipPlaceComposes { get; private set;}
        public void ParseFuncConfig()
        {
            lockEquipLayerDict = new Dictionary<int, int>();
            suitTypeDict = new Dictionary<int, List<int>>();
            var equipZhuXian = Config.Instance.Get<FuncConfigConfig>("EquipZhuXian");
            var lockEquipData = JsonMapper.ToObject(equipZhuXian.Numerical1);
            foreach(var key in lockEquipData.Keys)
            {
                int equipPlace = int.Parse(key);
                int towerLayer = int.Parse(lockEquipData[key].ToString());
                lockEquipLayerDict.Add(equipPlace,towerLayer);
            }
            var suitGroupData = JsonMapper.ToObject(equipZhuXian.Numerical2);
            foreach(var key in suitGroupData.Keys)
            {
@@ -75,6 +70,30 @@
                    }
                }
            }
            equipGetPathDict = new Dictionary<int, List<int>>();
            var jadeDynastyEquipGetPaths = Config.Instance.Get<FuncConfigConfig>("JadeDynastyEquipGetPaths");
            var equipGetPathData = JsonMapper.ToObject(jadeDynastyEquipGetPaths.Numerical1);
            foreach(var key in equipGetPathData.Keys)
            {
                var pathData = equipGetPathData[key];
                int equipPlace = int.Parse(key);
                List<int> pathIds = new List<int>();
                equipGetPathDict.Add(equipPlace,pathIds);
                if(pathData.IsArray)
                {
                    for(int i = 0; i < pathData.Count; i++)
                    {
                        int pathId = int.Parse(pathData[i].ToString());
                        pathIds.Add(pathId);
                    }
                }
            }
            var jadeDynastyEquipCompose = Config.Instance.Get<FuncConfigConfig>("JadeDynastyEquipCompose");
            int[] composes = ConfigParse.GetMultipleStr<int>(jadeDynastyEquipCompose.Numerical1);
            equipPlaceComposes = composes.ToList();
        }
        public Dictionary<int, Dictionary<int, JadeDynastySuitAttrData>> suitAttrDict { get; private set; }
@@ -101,6 +120,22 @@
                        dict.Add(suitLv, suitAttrData);
                    }
                }
            }
        }
        public void ParseTowerConfig()
        {
            lockEquipLayerDict = new Dictionary<int, int>();
            var configs = Config.Instance.GetAllValues<JadeDynastyTowerConfig>();
            foreach(var key in configs)
            {
                if(key.unLockEquipPlace != 0)
                {
                    int equipPlace = key.unLockEquipPlace;
                    int towerLayer = key.floorIndex;
                    lockEquipLayerDict.Add(equipPlace, towerLayer);
                }
            }
        }
@@ -141,8 +176,53 @@
        }
        #endregion
        #region 封包
        #region 查看物品
        public string lookGuid { get; private set; }
        public int jumpIndex { get; private set;}
        public void SetLookItemModel(string guid)
        {
            jumpIndex = -1;
            lookGuid = string.Empty;
            if (string.IsNullOrEmpty(guid)) return;
            var model = playerPack.GetItemModelByGUID(guid);
            if(model != null)
            {
                lookGuid = guid;
                int itemIndex = model.itemInfo.ItemPlace;
                jumpIndex = itemIndex / 5;
                WindowCenter.Instance.CloseImmediately<MainInterfaceWin>();
                WindowCenter.Instance.Open<JadeDynastyKnapSackWin>(false,0);
            }
        }
        public void ClearLookItemModel()
        {
            lookGuid = string.Empty;
            jumpIndex = -1;
        }
        #endregion
        #region 查看装备栏获取途径
        public Vector2 targetPos;
        public int targetEquipPlace { get; private set; }
        public void SetLookEquipGetPath(int equipPlace)
        {
            this.targetEquipPlace = equipPlace;
            RectTransformUtility.ScreenPointToLocalPointInRectangle(WindowCenter.Instance.uiRoot.tipsCanvas, Input.mousePosition, WindowCenter.Instance.uiRoot.uicamera, out targetPos);
            if(!WindowCenter.Instance.IsOpen<JadeDynastyEquipGetPathsWin>())
            {
                WindowCenter.Instance.Open<JadeDynastyEquipGetPathsWin>();
            }
        }
        #endregion
        public bool TryGetEquipPaths(int equipPlace, out List<int> pathIds)
        {
            pathIds = null;
            return equipGetPathDict.TryGetValue(equipPlace,out pathIds);
        }
        public bool TryGetJadeDynastyEquipIndex(int equipPlace,out int equipIndex)
        {
@@ -304,7 +384,7 @@
                case PackType.rptJadeDynastyItem:
                    if(isMax)
                    {
                        curSuitLv = maxSuitLv;
                        nextSuitLV = maxSuitLv;
                        return true;
                    }
                    break;
System/JadeDynastyKnapSack/JadeDynastyEquipWin.cs
@@ -21,8 +21,9 @@
        [SerializeField] int initCount = 100;
        PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }
        RoleParticularModel particularModel { get { return ModelCenter.Instance.GetModel<RoleParticularModel>(); } }
        PackModelInterface modelInterface { get { return ModelCenter.Instance.GetModel<PackModelInterface>(); } }
        JadeDynastyEquipModel equipModel { get { return ModelCenter.Instance.GetModel<JadeDynastyEquipModel>(); } }
        #region Built-in
        protected override void BindController()
        {
@@ -38,8 +39,8 @@
        protected override void OnPreOpen()
        {
            particularModel.PowerUpdate += UpdateFightPower;
            playerPack.RefreshItemCountAct += UpdateJadeDynastyItem;
            playerPack.RefreshPackAct += UpdateJadeDynastyKnapSack;
            SetDisplay();
        }
@@ -50,9 +51,10 @@
        protected override void OnPreClose()
        {
            particularModel.PowerUpdate -= UpdateFightPower;
            playerPack.RefreshPackAct -= UpdateJadeDynastyKnapSack;
            playerPack.RefreshItemCountAct -= UpdateJadeDynastyItem;
            UI3DModelExhibition.Instance.StopShow();
            equipModel.ClearLookItemModel();
        }
        protected override void OnAfterClose()
@@ -66,6 +68,7 @@
            CreateItemLine();
            UpdatePlayerUI3DModel();
            UpdateFightPower();
            UpdateLookItem();
            TimeDownMgr.CoolTimeData data;
            if (TimeDownMgr.Instance.Get(TimeDownMgr.CoolTimeType.BagSort, out data))
            {
@@ -82,6 +85,16 @@
            }
        }
        public void UpdateLookItem()
        {
            if (equipModel.jumpIndex < 0) return;
            int jumpIndex = equipModel.jumpIndex;
            jumpIndex = jumpIndex > 2 ? jumpIndex - 2 : jumpIndex;
            itemCtrl.JumpIndex(jumpIndex);
            itemCtrl.m_Scorller.RefreshActiveCellViews();
        }
        private void CreateItemLine()
        {
            itemCtrl.Refresh();
@@ -93,22 +106,39 @@
            itemCtrl.Restart();
        }
        private void UpdateJadeDynastyKnapSack(PackType type)
        {
            if (type != PackType.rptJadeDynastyItem) return;
            UpdateItemLine();
        }
        private void UpdateFightPower()
        {
            fightPowerText.text = particularModel.GetFuncFightPower((int)FuncPowerType.JadeDynastyEquip).ToString();
            int fightPower = 0;
            var singlePack = playerPack.GetSinglePackModel(PackType.rptJadeDynastyEquip);
            if (singlePack != null)
            {
                var dict = singlePack.GetPackModelIndexDict();
                foreach(var model in dict.Values)
                {
                    fightPower += model.equipScore;
                }
            }
            fightPowerText.text = fightPower.ToString();
        }
        private void UpdateJadeDynastyItem(PackType type, int index, int id)
        {
            if (type != PackType.rptJadeDynastyItem) return;
            switch(type)
            {
                case PackType.rptJadeDynastyItem:
                    UpdateItemLine();
                    equipModel.ClearLookItemModel();
                    break;
                case PackType.rptJadeDynastyEquip:
                    UpdatePlayerUI3DModel();
                    UpdateFightPower();
                    break;
            }
        }
System/JadeDynastyKnapSack/JadeDynastyItemBeh.cs
@@ -7,34 +7,72 @@
    {
        [SerializeField] ItemCell itemCell;
        [SerializeField] Button lockBtn;
        [SerializeField] UIEffect effect;
        [SerializeField] GameObject equipLvObj;
        [SerializeField] Text equipLvText;
        ItemTipsModel tipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }
        PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }
        JadeDynastyEquipModel equipModel { get { return ModelCenter.Instance.GetModel<JadeDynastyEquipModel>(); } }
        public void SetDisplay(int index)
        {
            var singlePack = playerPack.GetSinglePackModel(PackType.rptJadeDynastyItem);
            if (singlePack == null) return;
            equipLvObj.SetActive(false);
            var itemModel = playerPack.GetItemModelByIndex(PackType.rptJadeDynastyItem, index);
            itemCell.gameObject.SetActive(itemModel != null);
            if(itemModel != null)
            {
                lockBtn.gameObject.SetActive(false);
                itemCell.Init(itemModel,true);
                if (itemModel.EquipPlace > 0)
                {
                    equipLvObj.SetActive(true);
                    string equipLvSB = Language.Get(StringUtility.Contact("Num_CHS_", itemModel.chinItemModel.LV));
                    equipLvText.text = Language.Get("L1091", equipLvSB);
                }
                itemCell.cellBtn.RemoveAllListeners();
                itemCell.cellBtn.AddListener(()=>
                {
                    equipModel.ClearLookItemModel();
                    tipsModel.SetItemTipsModel(itemModel.packType,itemModel.itemInfo.ItemGUID,false,true);
                    tipsModel.SetBagTipsBtn(tipsModel.curAttrData);
                    tipsModel.SetJadeDynastyItemTipsBtn(tipsModel.curAttrData);
                    tipsModel.ShowUICtrl();
                });
                UpdatePlayerEffect(itemModel.itemInfo.ItemGUID);
            }
            else
            {
                bool isLock = index > (singlePack.openGridCount - 1);
                lockBtn.gameObject.SetActive(isLock);
                UpdatePlayerEffect(null);
            }
        }
        private void UpdatePlayerEffect(string guid)
        {
            if (effect == null) return;
            if(string.IsNullOrEmpty(guid))
            {
                if(effect.IsPlaying)
                {
                    effect.Stop();
                }
            }
            else
            {
                if(guid == equipModel.lookGuid)
                {
                    if (!effect.IsPlaying)
                    {
                        effect.Play();
                    }
                }
            }
        }
    }
System/JadeDynastySkill/JadeDynastySkillWin.cs
@@ -126,6 +126,9 @@
                    var config = Config.Instance.Get<SkillFrameAnimationConfig>(model.selectSkill);
                    m_SkillFrame.SetSprites(sprites, (float)config.totalTime / 1000);
                    m_SkillDescriptionIcon.SetSprite(config.descriptionIcon);
                    var rt = m_SkillFrame.transform as RectTransform;
                    rt.sizeDelta = config.sizeDelta;
                    rt.localPosition = config.position;
                }
            }
        }
System/JadeDynastyTower/JadeDynastyTowerHintWin.cs
@@ -55,14 +55,7 @@
            m_Floor.text = config.floorName;
            var isLastFloor = model.IsTopFloor(model.currentFloor);
            if (isLastFloor && model.currentFloor == model.highestPassFloor)
            {
                m_Reward.gameObject.SetActive(true);
                m_UnLockEquipPlace.gameObject.SetActive(false);
                m_Reward.SetItem(config.rewardIdsLevelS[0], config.rewardCountsLevelS[0]);
            }
            else
            if (model.currentFloor > model.highestPassFloor)
            {
                var isSpecialFloor = config.unLockEquipPlace > 0;
                if (isSpecialFloor)
@@ -74,11 +67,21 @@
                {
                    m_UnLockEquipPlace.gameObject.SetActive(false);
                    m_Reward.gameObject.SetActive(true);
                    m_Reward.SetItem(config.rewardIdsLevelS[0], config.rewardCountsLevelS[0]);
                    m_Reward.SetItem(config.rewardIdsFirstS[0], config.rewardCountsFirstS[0]);
                }
                m_Description.text = config.specialRewardDescription;
            }
            else
            {
                m_Reward.gameObject.SetActive(true);
                m_UnLockEquipPlace.gameObject.SetActive(false);
                m_Reward.SetItem(config.rewardIdsLevelS[0], config.rewardCountsLevelS[0]);
                var itemConfig = Config.Instance.Get<ItemConfig>(config.rewardIdsLevelS[0]);
                m_Description.text = Language.Get("JadeDynastyNameReward", itemConfig.ItemName);
            }
            m_Description.text = config.specialRewardDescription;
        }
    }
System/JadeDynastyTower/JadeDynastyTowerModel.cs
@@ -5,11 +5,14 @@
namespace Snxxz.UI
{
    [XLua.LuaCallCSharp]
    [XLua.Hotfix]
    public class JadeDynastyTowerModel : Model, IPlayerLoginOk, IMapInitOk, IBeforePlayerDataInitialize, ISwitchAccount
    {
        public const int DATA_MAPID = 31370;
        const int REDPOINTID_01 = 21501;
        const int REDPOINTID_02 = 215;
        const int REDPOINTID_03 = 21503;
        const int FUNCTIONID = 164;
        public int highestPassFloor { get; private set; }
@@ -37,9 +40,11 @@
        bool redpointConfirm_01 = false;
        bool redpointConfirm_02 = false;
        bool redpointConfirm_03 = false;
        Redpoint redpoint01 = new Redpoint(37, REDPOINTID_01);
        Redpoint redpoint02 = new Redpoint(REDPOINTID_02);
        Redpoint redpoint03 = new Redpoint(REDPOINTID_03);
        List<int> sortedFloors = new List<int>();
@@ -125,7 +130,10 @@
        public void SetOpenJadeDynastyTowerWinDirty()
        {
            openJadeDynastyTower = true;
            if (specialUnLockFloor==0)
            {
                openJadeDynastyTower = true;
            }
        }
        public List<int> GetShowFloors()
@@ -194,6 +202,12 @@
            UpateRedpoint();
        }
        public void ConfirmRedpoint03()
        {
            redpointConfirm_03 = true;
            UpateRedpoint();
        }
        public void OnPlayerLoginOk()
        {
            serverInited = true;
@@ -204,6 +218,7 @@
        {
            redpointConfirm_01 = false;
            redpointConfirm_02 = false;
            redpointConfirm_03 = false;
        }
        public void OnMapInitOk()
@@ -237,6 +252,15 @@
            {
                redpoint02.state = RedPointState.None;
            }
            if (!redpointConfirm_03)
            {
                redpoint03.state = challengable ? RedPointState.Simple : RedPointState.None;
            }
            else
            {
                redpoint03.state = RedPointState.None;
            }
        }
        private void ParseConfig()
System/JadeDynastyTower/JadeDynastyTowerRankBehaviour.cs
@@ -51,7 +51,7 @@
        private void ViewRank()
        {
            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.JadeDynastyTowerRank);
            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.JadeDynastyTowerRank289);
        }
        public struct RankInfo
System/JadeDynastyTower/JadeDynastyTowerRewardBehaviour.cs
@@ -3,7 +3,7 @@
//    [  Date ]:           Monday, January 21, 2019
//--------------------------------------------------------
using UnityEngine;
using System.Collections;
using System.Collections.Generic;
using UnityEngine.UI;
using TableConfig;
@@ -20,19 +20,33 @@
        [SerializeField] Text m_ExtraRewardFloor;
        [SerializeField] Text m_ExtraRewardDescription;
        JadeDynastyTowerModel model { get { return ModelCenter.Instance.GetModel<JadeDynastyTowerModel>(); } }
        public void Display(int floor)
        {
            var config = Config.Instance.Get<JadeDynastyTowerConfig>(floor);
            var rewardLevelS = new List<Item>();
            if (model.currentFloor > model.highestPassFloor)
            {
                for (var i = 0; i < config.rewardIdsFirstS.Length; i++)
                {
                    rewardLevelS.Add(new Item(config.rewardIdsFirstS[i], config.rewardCountsFirstS[i]));
                }
            }
            for (var i = 0; i < config.rewardIdsLevelS.Length; i++)
            {
                rewardLevelS.Add(new Item(config.rewardIdsLevelS[i], config.rewardCountsLevelS[i]));
            }
            for (var i = 0; i < m_RewardsLevelS.Length; i++)
            {
                var behaviour = m_RewardsLevelS[i];
                if (i < config.rewardIdsLevelS.Length)
                if (i < rewardLevelS.Count)
                {
                    var id = config.rewardIdsLevelS[i];
                    var count = config.rewardCountsLevelS[i];
                    behaviour.gameObject.SetActive(true);
                    behaviour.SetItem(id, count);
                    behaviour.SetItem(rewardLevelS[i]);
                }
                else
                {
@@ -46,7 +60,7 @@
                if (i < config.rewardIdsLevelA.Length)
                {
                    var id = config.rewardIdsLevelA[i];
                    var count = config.rewardIdsLevelS[i];
                    var count = config.rewardCountsLevelA[i];
                    behaviour.gameObject.SetActive(true);
                    behaviour.SetItem(id, count);
                }
System/JadeDynastyTower/JadeDynastyTowerWin.cs
@@ -12,7 +12,7 @@
namespace Snxxz.UI
{
    [XLua.Hotfix]
    public class JadeDynastyTowerWin : Window
    {
        [SerializeField] JadeDynastyTowerBehaviour m_TowerBehaviour;
@@ -148,6 +148,7 @@
        private void Challenge()
        {
            model.ConfirmRedpoint03();
            model.RequestChallenge();
        }
System/JadeDynastyTower/JadyDynastyTowerVictoryWin.cs
@@ -29,6 +29,7 @@
        protected override void AddListeners()
        {
            m_Award.SetListener(Award);
            m_Exit.SetListener(ExitDungeon);
        }
        protected override void OnPreOpen()
@@ -104,16 +105,9 @@
        private void Award()
        {
            model.SetOpenJadeDynastyTowerWinDirty();
            model.RequestAward();
            if (model.IsTopFloor(model.currentFloor))
            {
                dungeonModel.ExitCurrentDungeon();
            }
            else
            {
                ChallengeNextRuneTower();
            }
            dungeonModel.ExitCurrentDungeon();
        }
    }
System/KnapSack/BetterItemGetBehaviour.cs
@@ -25,6 +25,9 @@
        [SerializeField] Text coolTimeText;
        [SerializeField] Button m_Puton;
        [SerializeField] Button m_BetterEquipDetail;
        [SerializeField] GameObject equipLvObj;
        [SerializeField] Text equipLvText;
        ItemTipsModel itemTipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }
        PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }
        BetterEquipGetModel model { get { return ModelCenter.Instance.GetModel<BetterEquipGetModel>(); } }
@@ -90,41 +93,62 @@
            ItemModel betterEquip;
            if (model.TryGetBetterEquip(model.currentEquipGuid, out betterEquip))
            {
                var itemConfig = Config.Instance.Get<ItemConfig>(betterEquip.itemInfo.ItemID);
                if (NewBieCenter.Instance.inGuiding)
                switch(betterEquip.packType)
                {
                    case PackType.rptItem:
                        ToOpenRoleKanpsack(betterEquip);
                        break;
                    case PackType.rptJadeDynastyItem:
                        ToOpenJadeDynastyKnapsack(betterEquip);
                        break;
                }
            }
        }
        private void ToOpenRoleKanpsack(ItemModel betterEquip)
        {
            var itemConfig = Config.Instance.Get<ItemConfig>(betterEquip.itemInfo.ItemID);
            if (NewBieCenter.Instance.inGuiding)
            {
                playerPack.SetLookIndex(betterEquip.itemInfo.ItemGUID);
                WindowCenter.Instance.Close<MainInterfaceWin>();
                WindowCenter.Instance.Open<KnapSackWin>();
                StartCoroutine(Co_Delay(model.currentEquipGuid));
            }
            else
            {
                if (itemConfig.ItemColor >= 3)
                {
                    playerPack.SetLookIndex(betterEquip.itemInfo.ItemGUID);
                    WindowCenter.Instance.Close<MainInterfaceWin>();
                    WindowCenter.Instance.Open<KnapSackWin>();
                    StartCoroutine(Co_Delay(model.currentEquipGuid));
                }
                else
                {
                    if (itemConfig.ItemColor >= 3)
                    if ((itemConfig.LV == 1 || itemConfig.LV == 2) && (itemConfig.EquipPlace == 1 || itemConfig.EquipPlace == 2))
                    {
                        playerPack.SetLookIndex(betterEquip.itemInfo.ItemGUID);
                        WindowCenter.Instance.Close<MainInterfaceWin>();
                        WindowCenter.Instance.Open<KnapSackWin>();
                        if ((itemConfig.LV == 1 || itemConfig.LV == 2) && (itemConfig.EquipPlace == 1 || itemConfig.EquipPlace == 2))
                        {
                            StartCoroutine(Co_Delay(model.currentEquipGuid));
                        }
                        else
                        {
                            model.ReportConfirmBetterEquip(model.currentEquipGuid);
                        }
                        StartCoroutine(Co_Delay(model.currentEquipGuid));
                    }
                    else
                    {
                        PackSendQuestMgr.Instance.SendPutOnQuest(ItemWinBtnType.putOn, model.currentEquipGuid);
                        model.ReportConfirmBetterEquip(model.currentEquipGuid);
                    }
                }
                else
                {
                    PackSendQuestMgr.Instance.SendPutOnQuest(ItemWinBtnType.putOn, model.currentEquipGuid);
                    model.ReportConfirmBetterEquip(model.currentEquipGuid);
                }
            }
        }
        private void ToOpenJadeDynastyKnapsack(ItemModel betterEquip)
        {
            var equipModel = ModelCenter.Instance.GetModel<JadeDynastyEquipModel>();
            equipModel.SetLookItemModel(betterEquip.itemInfo.ItemGUID);
            model.ReportConfirmBetterEquip(model.currentEquipGuid);
        }
        private void ShowBetterEquipDetails()
@@ -150,6 +174,17 @@
            m_FunctionTitle.text = Language.Get(itemConfig.ItemColor >= 3 ? "GoodEquip_See" : "GoodEquip_FitUp");
            m_EquipBehaviour.Init(betterModel, true);
            UpdateCoolTime(betterModel.itemInfo.ItemGUID);
            if(betterModel.packType == PackType.rptJadeDynastyItem && betterModel.chinItemModel.EquipPlace > 0)
            {
                equipLvObj.SetActive(true);
                string equipLvSB = Language.Get(StringUtility.Contact("Num_CHS_", betterModel.chinItemModel.LV));
                equipLvText.text = Language.Get("L1091", equipLvSB);
            }
            else
            {
                equipLvObj.SetActive(false);
            }
        }
        IEnumerator Co_Delay(string _guid)
System/KnapSack/Logic/EquipTip.cs
@@ -971,7 +971,37 @@
            source.jobTitleText.text = Language.Get("EquipWin_JobTitleText_1");
            source.jobText.text = itemTipsModel.GetEquipJobName(itemAttrData);
            source.partTitleText.text = Language.Get("EquipWin_PartTitleText_1");
            source.partText.text = StringUtility.Contact(FuncConfigConfig.GetEquipTipsAreaName(itemAttrData.itemConfig.EquipPlace), itemAttrData.itemConfig.LV,Language.Get("L1047"));
            int equipPlace = itemAttrData.itemConfig.EquipPlace;
            switch(equipPlace)
            {
                case 1:
                case 2:
                case 3:
                case 4:
                case 5:
                case 6:
                case 7:
                case 8:
                case 9:
                case 10:
                case 12:
                    source.partText.text = StringUtility.Contact(FuncConfigConfig.GetEquipTipsAreaName(itemAttrData.itemConfig.EquipPlace), itemAttrData.itemConfig.LV, Language.Get("L1047"));
                    break;
                case 121:
                case 122:
                case 123:
                case 124:
                case 125:
                case 126:
                case 127:
                case 128:
                case 129:
                case 130:
                case 131:
                case 132:
                    source.partText.text = StringUtility.Contact(Language.Get(((RoleEquipType)equipPlace).ToString()), itemAttrData.itemConfig.LV, Language.Get("L1047"));
                    break;
            }
        }
        private void CreateFuncBtn()
System/KnapSack/Logic/ItemTipsModel.cs
@@ -1075,6 +1075,100 @@
                }
            }
        }
        public void SetJadeDynastyItemTipsBtn(ItemAttrData attrData)
        {
            if (attrData == null) return;
            bool isOverdue = modelInterface.IsOverdue(attrData.guid, attrData.itemId, attrData.useDataDict);
            if (attrData.itemConfig.CanSell == 1)
            {
                attrData.SetTipsFuncBtn(ItemWinBtnType.sell, (ItemWinBtnType, ItemAttrData) => { PackSendQuestMgr.Instance.SendSellQuest(ItemWinBtnType.sell, attrData); });
            }
            List<int> dismantleReturnlist = attrData.GetUseDataModel((int)ItemUseDataKey.Def_IudetItemDecompound);
            if (dismantleReturnlist != null && dismantleReturnlist.Count > 0)
            {
                attrData.SetTipsFuncBtn(ItemWinBtnType.dismantle, (ItemWinBtnType, ItemAttrData) => { PackSendQuestMgr.Instance.SendDismantleQuest(ItemWinBtnType.dismantle, attrData); });
            }
            if (!isOverdue)
            {
                if (attrData.itemConfig.JumpComposeCondi != null && attrData.itemConfig.JumpComposeCondi.Length > 0)
                {
                    attrData.SetTipsFuncBtn(ItemWinBtnType.compose, (ItemWinBtnType, ItemAttrData) => {
                        int jumpId = 0;
                        bool isUnlock = ModelCenter.Instance.GetModel<ComposeWinModel>().CheckComposeItemById(attrData.itemId, out jumpId);
                        if (isUnlock)
                        {
                            PackSendQuestMgr.Instance.ClickComposeBtn(ItemWinBtnType.compose, jumpId);
                        }
                    });
                }
                if (attrData.itemConfig.Type == 25 && attrData.itemConfig.Effect1 == 225)
                {
                    attrData.SetTipsFuncBtn(ItemWinBtnType.inlay, (ItemWinBtnType, ItemAttrData) => { PackSendQuestMgr.Instance.ClickInlayBtn(ItemWinBtnType.inlay, attrData.guid); });
                }
                if (attrData.itemConfig.CanTrade == 1 && attrData.isBind == 0)
                {
                    attrData.SetTipsFuncBtn(ItemWinBtnType.putAway, (ItemWinBtnType, ItemAttrData) => { PackSendQuestMgr.Instance.SendPutAwayQuest(ItemWinBtnType.putAway, attrData.guid); });
                }
            }
            if (attrData.count > 1)
            {
                attrData.SetTipsFuncBtn(ItemWinBtnType.split, (ItemWinBtnType, ItemAttrData) => { PackSendQuestMgr.Instance.OnClickSplitBtn(ItemWinBtnType.split, attrData.guid); });
            }
            if (!isOverdue)
            {
                switch (attrData.winType)
                {
                    case ItemWinType.equipWin:
                        attrData.SetTipsFuncBtn(ItemWinBtnType.putOn, (ItemWinBtnType, ItemAttrData) => { PackSendQuestMgr.Instance.SendPutOnQuest(ItemWinBtnType.putOn, attrData.guid); });
                        break;
                }
                if (attrData.itemConfig.UseTag == 1)
                {
                    attrData.SetTipsFuncBtn(ItemWinBtnType.makeUse, (ItemWinBtnType, ItemAttrData) => { PackSendQuestMgr.Instance.SendUseItemQuest(ItemWinBtnType.makeUse, attrData.index); });
                }
            }
            for (int i = 0; i < ItemRenewalIds.Length; i++)
            {
                if (ItemRenewalIds[i] == attrData.itemId)
                {
                    if (isOverdue)
                    {
                        attrData.SetTipsFuncBtn(ItemWinBtnType.renewal, (ItemWinBtnType, ItemAttrData) => { PackSendQuestMgr.Instance.SendRenewalQuest(ItemWinBtnType.renewal, attrData.guid); });
                    }
                }
            }
            for (int i = 0; i < tryPutOnEquipIds.Length; i++)
            {
                if (tryPutOnEquipIds[i] == attrData.itemId)
                {
                    if (PlayerDatas.Instance.baseData.coinPointTotal <= 0)
                    {
                        attrData.SetTipsFuncBtn(ItemWinBtnType.renewal, (ItemWinBtnType, ItemAttrData) => { WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.FirstRecharge); });
                    }
                }
            }
        }
        public void SetJadeDynastyPutOnTipsBtn(ItemAttrData attrData)
        {
            if (attrData == null) return;
            RoleEquipType equipType = (RoleEquipType)attrData.itemConfig.EquipPlace;
            attrData.SetTipsFuncBtn(ItemWinBtnType.putOff, (ItemWinBtnType, ItemAttrData) => {
                PackSendQuestMgr.Instance.SendPutOffQuest(ItemWinBtnType.putOff, attrData.guid);
            });
        }
        #endregion
        #region 设置获取途径列表
@@ -1480,6 +1574,18 @@
                case 9:
                case 10:
                case 12:
                case 121:
                case 122:
                case 123:
                case 124:
                case 125:
                case 126:
                case 127:
                case 128:
                case 129:
                case 130:
                case 131:
                case 132:
                    idlist.Sort(CompareLegendAttrType);
                    break;
                case 101:
@@ -1634,6 +1740,18 @@
                        case 9:
                        case 10:
                        case 12:
                        case 121:
                        case 122:
                        case 123:
                        case 124:
                        case 125:
                        case 126:
                        case 127:
                        case 128:
                        case 129:
                        case 130:
                        case 131:
                        case 132:
                            s = GetTextColorByLegendType(GetLegendType(idlist[i]), s);
                            break;
                        case 101:
System/KnapSack/Logic/PackModelInterface.cs
@@ -463,13 +463,16 @@
                    Equation.Instance.AddKeyValue("AtkSpeedC", 0);
                }
                DebugEx.Log("评分:" + Equation.Instance.Eval<double>(_equipGSFormula.Numerical1));
                if (type == PackType.rptDogzEquip || type == PackType.rptDogzItem)
                switch(type)
                {
                    return Equation.Instance.Eval<int>(_equipGSFormula.Numerical3);
                }
                else
                {
                    return Equation.Instance.Eval<int>(_equipGSFormula.Numerical1);
                    case PackType.rptDogzEquip:
                    case PackType.rptDogzItem:
                         return Equation.Instance.Eval<int>(_equipGSFormula.Numerical3);
                    case PackType.rptJadeDynastyItem:
                    case PackType.rptJadeDynastyEquip:
                        return Equation.Instance.Eval<int>(_equipGSFormula.Numerical4);
                    default:
                        return Equation.Instance.Eval<int>(_equipGSFormula.Numerical1);
                }
            }
            return 0;
@@ -817,27 +820,54 @@
        public event Action<string> RefreshGetBetterEquipEvent; //得到更好的装备 value 物品的实例ID
        public bool IsSameJob(int jobLimit)
        {
            return jobLimit == 0 || jobLimit / 100 == PlayerDatas.Instance.baseData.Job;
        }
        public void OnGetEquip(ItemModel model)
        {
            if (model.packType != PackType.rptItem
                || (model.chinItemModel.EquipPlace <= 0 || model.chinItemModel.EquipPlace > 12)
                || (model.chinItemModel.JobLimit / 100 != PlayerDatas.Instance.baseData.Job
                    && model.chinItemModel.Type != (int)ItemType.Necklaces
                    && model.chinItemModel.Type != (int)ItemType.FairyEquip
                    && model.chinItemModel.Type != (int)ItemType.SpiritAnimal))
            {
                return;
            }
            if (model == null) return;
            if (model.packType != PackType.rptItem && model.packType != PackType.rptJadeDynastyItem) return;
            if (!IsSameJob(model.chinItemModel.JobLimit)) return;
            if (betterEquipExceptDungeonDict.ContainsKey(PlayerDatas.Instance.baseData.MapID))
            int equipPlace = model.chinItemModel.EquipPlace;
            switch ((RoleEquipType)equipPlace)
            {
                if (betterEquipExceptDungeonDict[PlayerDatas.Instance.baseData.MapID].Contains(model.itemInfo.ItemID))
                {
                    return;
                }
                case RoleEquipType.retWeapon:
                case RoleEquipType.retWeapon2:
                case RoleEquipType.retHat:
                case RoleEquipType.retClothes:
                case RoleEquipType.retBelt:
                case RoleEquipType.retTrousers:
                case RoleEquipType.retShoes:
                case RoleEquipType.retNeck:
                case RoleEquipType.retFairyCan:
                case RoleEquipType.retFairyCan2:
                case RoleEquipType.retWing:
                case RoleEquipType.retSpiritAnimal:
                case RoleEquipType.JadeDynasty_Cloak:
                case RoleEquipType.JadeDynasty_FaceMask:
                case RoleEquipType.JadeDynasty_Glove1:
                case RoleEquipType.JadeDynasty_Glove2:
                case RoleEquipType.JadeDynasty_Ruyi:
                case RoleEquipType.JadeDynasty_Pendant:
                case RoleEquipType.JadeDynasty_Ring1:
                case RoleEquipType.JadeDynasty_Ring2:
                case RoleEquipType.JadeDynasty_Sword1:
                case RoleEquipType.JadeDynasty_Sword2:
                case RoleEquipType.JadeDynasty_Sword3:
                case RoleEquipType.JadeDynasty_Sword4:
                    if (betterEquipExceptDungeonDict.ContainsKey(PlayerDatas.Instance.baseData.MapID))
                    {
                        if (betterEquipExceptDungeonDict[PlayerDatas.Instance.baseData.MapID].Contains(model.itemInfo.ItemID))
                        {
                            return;
                        }
                    }
                    SetGetBetterEquipEvent(model);
                    break;
            }
            SetGetBetterEquipEvent(model);
        }
        private void SetGetBetterEquipEvent(ItemModel model)
@@ -860,63 +890,35 @@
                    }
                }
            }
            ItemModel equipItemModel = null;
            SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptEquip);
            int putOnScore = 0;
            if (model.chinItemModel.EquipPlace != 9)
            {
                if (singlePack != null)
                {
                    equipItemModel = singlePack.GetItemModelByIndex(model.chinItemModel.EquipPlace);
                    if (equipItemModel != null)
                    {
                        putOnScore = equipItemModel.equipScore;
                    }
                    if (CheckIsBetterEquip(model.equipScore, putOnScore))
                    {
                        if (PlayerDatas.Instance.baseData.LV >= 200)
            int isFightUp = IsFightUp(model.itemId,model.equipScore);
            int equipPlace = model.chinItemModel.EquipPlace;
            if (isFightUp == 1)
            {
               switch(equipPlace)
                {
                    case 9:
                        break;
                    default:
                        if(model.packType == PackType.rptItem)
                        {
                            if (model.EquipPlace > (int)RoleEquipType.retWeapon2 && model.EquipPlace < (int)RoleEquipType.retNeck)
                            var equipItemModel = playerPack.GetItemModelByIndex(PackType.rptEquip, model.chinItemModel.EquipPlace);
                            if (PlayerDatas.Instance.baseData.LV >= 200)
                            {
                                if (equipItemModel != null && equipItemModel.chinItemModel.ItemColor > model.chinItemModel.ItemColor)
                                if (model.EquipPlace > (int)RoleEquipType.retWeapon2 && model.EquipPlace < (int)RoleEquipType.retNeck)
                                {
                                    return;
                                    if (equipItemModel != null && equipItemModel.chinItemModel.ItemColor > model.chinItemModel.ItemColor)
                                    {
                                        return;
                                    }
                                }
                            }
                        }
                        if (RefreshGetBetterEquipEvent != null)
                        {
                            RefreshGetBetterEquipEvent(model.itemInfo.ItemGUID);
                        }
                    }
                        break;
                }
            }
            else
            {
                if (singlePack != null)
                if (RefreshGetBetterEquipEvent != null)
                {
                    equipItemModel = singlePack.GetItemModelByIndex(model.chinItemModel.EquipPlace);
                    if (equipItemModel != null)
                    {
                        putOnScore = equipItemModel.equipScore;
                    }
                    bool isbetter = CheckIsBetterEquip(model.equipScore, putOnScore);
                    if (!isbetter)
                    {
                        equipItemModel = singlePack.GetItemModelByIndex(10);
                        putOnScore = equipItemModel == null ? 0 : equipItemModel.equipScore;
                        isbetter = CheckIsBetterEquip(model.equipScore, putOnScore);
                    }
                    if (isbetter)
                    {
                        if (RefreshGetBetterEquipEvent != null)
                        {
                            RefreshGetBetterEquipEvent(model.itemInfo.ItemGUID);
                        }
                    }
                    RefreshGetBetterEquipEvent(model.itemInfo.ItemGUID);
                }
            }
        }
System/KnapSack/Logic/PackSendQuestMgr.cs
@@ -166,20 +166,6 @@
                }
            }
            if(config.EquipPlace >= (int)RoleEquipType.JadeDynasty_Cloak
                && config.EquipPlace <= (int)RoleEquipType.JadeDynasty_Sword4)
            {
                var jadeDynastyModel = ModelCenter.Instance.GetModel<JadeDynastyEquipModel>();
                bool islock = jadeDynastyModel.IsLockEquipPlace(config.EquipPlace);
                isCanPut = !islock;
                if(islock)
                {
                    int towerlayer = 0;
                    jadeDynastyModel.TryGetLockTowerLayer(config.EquipPlace,out towerlayer);
                    SysNotifyMgr.Instance.ShowTip("JadeDynastyEquip",towerlayer);
                }
            }
            if(isCanPut)
            {
                CheckPutOnPlace();
@@ -570,16 +556,33 @@
                return;
            }
            if (sendItemModel != null && sendItemModel.itemInfo.IsBind == 0)
            if(sendItemModel.packType == PackType.rptJadeDynastyItem)
            {
                ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("JadeDynastyEquip5"),(bool isOk)=>
                if (sendItemModel.chinItemModel.EquipPlace >= (int)RoleEquipType.JadeDynasty_Cloak
                     && sendItemModel.chinItemModel.EquipPlace <= (int)RoleEquipType.JadeDynasty_Sword4)
                {
                    if(isOk)
                    var jadeDynastyModel = ModelCenter.Instance.GetModel<JadeDynastyEquipModel>();
                    bool islock = jadeDynastyModel.IsLockEquipPlace(sendItemModel.chinItemModel.EquipPlace);
                    if (islock)
                    {
                        SendPutOnQuest(equipPlace, itemIndex);
                        int towerlayer = 0;
                        jadeDynastyModel.TryGetLockTowerLayer(sendItemModel.chinItemModel.EquipPlace, out towerlayer);
                        SysNotifyMgr.Instance.ShowTip("JadeDynastyEquip", towerlayer);
                        return;
                    }
                });
                return;
                }
                if (sendItemModel != null && sendItemModel.itemInfo.IsBind == 0)
                {
                    ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("JadeDynastyEquip5"), (bool isOk) =>
                    {
                        if (isOk)
                        {
                            SendPutOnQuest(equipPlace, itemIndex);
                        }
                    });
                    return;
                }
            }
            SendPutOnQuest(equipPlace, itemIndex);
@@ -1167,15 +1170,15 @@
        }
        public void SendSplitQuest(string guid,int splitCount)
        {
            SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);
            if (singlePack == null) return;
            if (string.IsNullOrEmpty(guid)) return;
            ItemModel itemModel = playerPack.GetItemModelByGUID(guid);
            if (itemModel == null || itemModel.packType != PackType.rptItem) return;
            if (playerPack.GetReaminGridCount(PackType.rptItem) < 1)
            if (itemModel == null) return;
            var packType = GeneralDefine.GetPackTypeByItemType(itemModel.chinItemModel.Type);
            var singlePack = playerPack.GetSinglePackModel(packType);
            if (playerPack.GetReaminGridCount(packType) < 1)
            {
                SysNotifyMgr.Instance.ShowTip("GeRen_chenxin_998371");
                SysNotifyMgr.Instance.ShowTip("GeRen_chenxin_676165",packType);
            }
            else
            {
System/KnapSack/New/FairyWearWin.cs
@@ -15,6 +15,8 @@
    public class FairyWearWin : Window
    {
        #region 成员变量
        [SerializeField] Image wear01Img;
        [SerializeField] Image wear02Img;
        private Button _closeBtn;
        private Button _wear01Btn;
        private Button _wear02Btn;
@@ -66,7 +68,9 @@
            curItemModel = PackSendQuestMgr.Instance.sendItemModel;
            if(curItemModel != null)
            {
               switch(curItemModel.packType)
                wear01Img.SetSprite(StringUtility.Contact("EquipPlace_",curItemModel.chinItemModel.EquipPlace));
                wear02Img.SetSprite(StringUtility.Contact("EquipPlace_", curItemModel.chinItemModel.EquipPlace));
                switch (curItemModel.packType)
                {
                    case PackType.rptItem:
                        _itemModel01 = playerPack.GetItemModelByIndex(PackType.rptEquip,(int)RoleEquipType.retFairyCan);
System/KnapSack/New/SplitWin.cs
@@ -101,7 +101,7 @@
        public void InitPanel()
        {
            ItemModel itemModel = playerPack.GetItemModelByGUID(itemTipsModel.curAttrData.guid);
            if (itemModel == null || itemModel.packType != PackType.rptItem)
            if (itemModel == null)
                return;
            _itemCell.Init(itemModel);
System/Launch/LaunchWin.cs
@@ -19,9 +19,7 @@
        [SerializeField] Image m_BackGround;
        [SerializeField] RectTransform m_AndroidProgressContainer;
        [SerializeField] SmoothSlider m_PartProgressSlider;
        [SerializeField] Text m_PartProgress;
        [SerializeField] SmoothSlider m_TotalProgressSlider;
        [SerializeField] Text m_TotalProgress;
        [SerializeField] Text m_StageDescription;
        [SerializeField] RectTransform m_IosProgressContainer;
        [SerializeField] Text m_IosProgressTip;
@@ -32,6 +30,7 @@
        bool assetBuildTimeShowed = false;
        Launch.LaunchStage showStage = Launch.LaunchStage.None;
        int showStep = 0;
        string stepDescription = string.Empty;
        float backGroundTimer = 0f;
@@ -110,14 +109,14 @@
            m_AlphaTween.Play();
        }
        string GetLaunchStageDescription(Launch.LaunchStage _stage)
        string GetLaunchStageDescription(Launch.LaunchStage _stage, int step)
        {
            switch (_stage)
            {
                case Launch.LaunchStage.SDKInit:
                    return Language.GetFromLocal(36);
                case Launch.LaunchStage.AssetCopy:
                    return Language.GetFromLocal(37);
                    return StringUtility.Contact(Language.GetFromLocal(37), "(", step, ")");
                case Launch.LaunchStage.ClientVersion:
                    return Language.GetFromLocal(38);
                case Launch.LaunchStage.CheckAsset:
@@ -127,7 +126,7 @@
                case Launch.LaunchStage.AssetBundleInit:
                    return Language.GetFromLocal(41);
                case Launch.LaunchStage.ConfigInit:
                    return Language.GetFromLocal(42);
                    return StringUtility.Contact(Language.GetFromLocal(42), "(", step, ")");
                case Launch.LaunchStage.Complete:
                    return Language.GetFromLocal(43);
                default:
@@ -166,14 +165,17 @@
            else
            {
                var progressInfo = Launch.progressInfo;
                m_TotalProgressSlider.value = progressInfo.totalProgress;
                m_TotalProgress.text = StringUtility.Contact(Mathf.RoundToInt(progressInfo.totalProgress * 100), "%");
                if (progressInfo.stage == Launch.LaunchStage.DownLoad)
                {
                    if (m_PartProgressSlider.gameObject.activeInHierarchy)
                    {
                        m_PartProgressSlider.gameObject.SetActive(false);
                    }
                    if (m_TotalProgressSlider.gameObject.activeInHierarchy)
                    {
                        m_TotalProgressSlider.gameObject.SetActive(false);
                    }
                }
                else
@@ -183,11 +185,16 @@
                        m_PartProgressSlider.gameObject.SetActive(true);
                    }
                    if (!m_TotalProgressSlider.gameObject.activeInHierarchy)
                    {
                        m_TotalProgressSlider.gameObject.SetActive(true);
                    }
                    m_TotalProgressSlider.value = progressInfo.totalProgress;
                    m_PartProgressSlider.value = progressInfo.partProgress;
                    m_PartProgress.text = StringUtility.Contact(Mathf.RoundToInt(progressInfo.partProgress * 100), "%");
                }
                DisplayStageDescription(progressInfo.stage);
                DisplayStageDescription(progressInfo.stage, progressInfo.step);
                if (!assetBuildTimeShowed && AssetVersionUtility.assetsBuildTime != DateTime.MinValue)
                {
@@ -199,12 +206,13 @@
        }
        private void DisplayStageDescription(Launch.LaunchStage stage)
        private void DisplayStageDescription(Launch.LaunchStage stage, int step)
        {
            if (showStage != stage)
            if (showStage != stage || showStep != step)
            {
                showStage = stage;
                m_StageDescription.text = GetLaunchStageDescription(stage);
                showStep = step;
                m_StageDescription.text = GetLaunchStageDescription(stage, step);
            }
        }
System/Realm/RealmPropertyUpWin.cs
@@ -425,6 +425,8 @@
            {
                var config = Config.Instance.Get<SkillFrameAnimationConfig>(skillId);
                m_NewGotSkillFrame.SetSprites(sprites, (float)config.totalTime / 1000);
                var rt = m_NewGotSkillFrame.transform as RectTransform;
                rt.sizeDelta = config.sizeDelta;
            }
        }
System/WindowJump/WindowJumpMgr.cs
@@ -192,6 +192,7 @@
            case JumpUIType.EquipCompose268:
            case JumpUIType.EquipCompose269:
            case JumpUIType.EquipCompose270:
            case JumpUIType.EquipCompose291:
                int[] types = GetSearchData(_tagWinSearchModel.ID).conditions;
                if(types.Length > 0)
                {
@@ -378,6 +379,7 @@
            case JumpUIType.LootPreciousFrameFunc1:
            case JumpUIType.DogzDungeon:
            case JumpUIType.FairyGrabBoss:
            case JumpUIType.JadeDynastyBoss290:
                SetJumpLogic<LootPreciousFrameWin>(_tagWinSearchModel.TABID);
                break;
            case JumpUIType.LootPreciousFrameSpec:
@@ -703,7 +705,10 @@
            case JumpUIType.PrayforDrug:
                SetJumpLogic<PrayforDrugWin>(_tagWinSearchModel.TABID);
                break;
            case JumpUIType.JadeDynastyTowerRank:
            case JumpUIType.JadeDynastyTower288:
                SetJumpLogic<TowerWin>(_tagWinSearchModel.TABID);
                break;
            case JumpUIType.JadeDynastyTowerRank289:
                var rankModel = ModelCenter.Instance.GetModel<RankModel>();
                rankModel.jumpRankType = int.Parse(_tagWinSearchModel.SelectActive);
                SetJumpLogic<RankPanel>(_tagWinSearchModel.TABID);
@@ -1010,6 +1015,7 @@
            case JumpUIType.EquipCompose268:
            case JumpUIType.EquipCompose269:
            case JumpUIType.EquipCompose270:
            case JumpUIType.EquipCompose291:
                int[] types = GetSearchData(_tagWinSearchModel.ID).conditions;
                if (types.Length > 0)
                {
@@ -1598,8 +1604,10 @@
    SevenDaysTour285 = 285, //七日巡礼
    SevenDaysTour286 = 286, //七日巡礼
    SevenDaysTour287 = 287, //七日巡礼
    JadeDynastyTowerRank = 289,//排行榜-诛仙塔
    JadeDynastyTower288 = 288,//诛仙塔
    JadeDynastyTowerRank289 = 289,//排行榜-诛仙塔
    JadeDynastyBoss290 = 290,//诛仙Boss
    EquipCompose291 = 291,//装备合成-诛仙装备
    DhszTs = 1001,//定海神针功法提升界面
    HyqTs = 1002,//皓月枪功法提升界面
    GyzTs = 1003,//鬼牙刃功法提升界面
Utility/EnumHelper.cs
@@ -1027,20 +1027,20 @@
    ZXRuyiAttrPer = 99,//诛仙·如意属性百分比
    ZXPendantAttrPer = 100, //诛仙·吊坠属性百分比
    ZXRingAttrPer = 101, //诛仙·戒指属性百分比
    SkillAddPer1 = 102,//定海神针技能伤害百分比
    SkillAddPer2 = 103, //皓月枪技能伤害百分比
    SkillAddPer3 = 104, //鬼牙刃技能伤害百分比
    SkillAddPer4 = 105, //磐龙印技能伤害百分比
    SkillAddPer5 = 106, //杏黄旗技能伤害百分比
    SkillAddPer6 = 107,//嗜天斧技能伤害百分比
    SkillAddPer7 = 108, //射日神弓技能伤害百分比
    SkillReducePer1 = 109, //定海神针技能减伤百分比
    SkillReducePer2 = 110, //皓月枪技能减伤百分比
    SkillReducePer3 = 111, //鬼牙刃技能减伤百分比
    SkillReducePer4 = 112, //磐龙印技能减伤百分比
    SkillReducePer5 = 113, //杏黄旗技能减伤百分比
    SkillReducePer6 = 114, //嗜天斧技能减伤百分比
    SkillReducePer7 = 115, //射日神弓技能减伤百分比
    SkillAddPerA = 102,//定海神针技能伤害百分比
    SkillAddPerB = 103, //皓月枪技能伤害百分比
    SkillAddPerC = 104, //鬼牙刃技能伤害百分比
    SkillAddPerD = 105, //磐龙印技能伤害百分比
    SkillAddPerE = 106, //杏黄旗技能伤害百分比
    SkillAddPerF = 107,//嗜天斧技能伤害百分比
    SkillAddPerG = 108, //射日神弓技能伤害百分比
    SkillReducePerA = 109, //定海神针技能减伤百分比
    SkillReducePerB = 110, //皓月枪技能减伤百分比
    SkillReducePerC = 111, //鬼牙刃技能减伤百分比
    SkillReducePerD = 112, //磐龙印技能减伤百分比
    SkillReducePerE = 113, //杏黄旗技能减伤百分比
    SkillReducePerF = 114, //嗜天斧技能减伤百分比
    SkillReducePerG = 115, //射日神弓技能减伤百分比
}
//UI图标类型
public enum SpriteFileType
Utility/StageLoadTimeOutCatcher.cs
@@ -12,6 +12,7 @@
    public static ProtocolRecorder gotA126Time;
    public static ProtocolRecorder gotA127Time;
    public static ProtocolRecorder got0109Time;
    public static ProtocolRecorder got0403Time;
    public static ProtocolRecorder send0107Time;
    public static StageLoadTimeOutCatcher Begin(int stageId)
@@ -46,13 +47,14 @@
        {
            var title = StringUtility.Contact(stageId, "地图加载超时");
            var description = StringUtility.Contact(
                                        "开始时间:", startTime.ToString("HH:mm:ss"), ";",
                                        "超时时间:", DateTime.Now.ToString("HH:mm:ss"),
                                        "0102记录:", got0102Time.ToString(), ";",
                                        "A126记录:", gotA126Time.ToString(), ";",
                                        "A127记录:", gotA127Time.ToString(), ";",
                                        "0109记录:", got0109Time.ToString(), ";",
                                        "0107记录:", send0107Time.ToString());
                                        "开始时间:", startTime.ToString("HH:mm:ss"), "$$",
                                        "超时时间:", DateTime.Now.ToString("HH:mm:ss"), "$$",
                                        got0102Time.ToString(), "$$",
                                        gotA126Time.ToString(), "$$",
                                        gotA127Time.ToString(), "$$",
                                        got0109Time.ToString(), "$$",
                                        send0107Time.ToString(), "$$",
                                        got0403Time.ToString());
            ExceptionCatcher.ReportException(title, description);
            Stop();
@@ -79,20 +81,11 @@
            case "0107":
                send0107Time = recorder;
                break;
            case "0403":
                got0403Time = recorder;
                break;
            default:
                break;
        }
        try
        {
            var title = StringUtility.Contact("地图加载记录-->封包编号:", number);
            var description = StringUtility.Contact(recorder.ToString(), "玩家:", PlayerDatas.Instance.baseData.PlayerName);
            ExceptionCatcher.ReportException(title, description);
        }
        catch (System.Exception ex)
        {
        }
    }