【战斗】占领-表现逻辑重新修改

2024-12-09 13:33:49 +08:00 · 2024-12-09 13:33:49 +08:00 · f187e21e5e
parent f5ea624be6
commit f187e21e5e
29 changed files with 2824 additions and 2246 deletions
--- a/ProjectNLD/Assets/Art_Out/Other/CapturePoint/Zhanling_likai.prefab
+++ b/ProjectNLD/Assets/Art_Out/Other/CapturePoint/Zhanling_likai.prefab
--- a/ProjectNLD/Assets/Art_Out/Other/CapturePoint/Zhanling_likai.prefab.meta
+++ b/ProjectNLD/Assets/Art_Out/Other/CapturePoint/Zhanling_likai.prefab.meta
--- a/ProjectNLD/Assets/Art_Out/Other/CapturePoint/capture_point_end.prefab
+++ b/ProjectNLD/Assets/Art_Out/Other/CapturePoint/capture_point_end.prefab
--- a/ProjectNLD/Assets/Art_Out/Other/CapturePoint/capture_point_end.prefab.meta
+++ b/ProjectNLD/Assets/Art_Out/Other/CapturePoint/capture_point_end.prefab.meta
--- a/ProjectNLD/Assets/Code/Scripts/Gameplay/Common/CodeDefine.cs
+++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Common/CodeDefine.cs
@ -62,6 +62,19 @@ namespace Gameplay.Common
            /// </summary>
            public static bool ONE_DAMAGE_KILL_ENEMY = false;

+            public static class CapturePoint
+            {
+                /// <summary>
+                /// 离开占领点特效ID
+                /// </summary>
+                public const int EFFECT_ID_EXIT = 20001;
+                
+                /// <summary>
+                /// 占领完成特效ID
+                /// </summary>
+                public const int EFFECT_ID_FINISH = 20002;
+            }
+
        }
    }
 }
--- a/ProjectNLD/Assets/Code/Scripts/Gameplay/Common/PathDefine.cs
+++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Common/PathDefine.cs
@ -75,8 +75,9 @@

        public static class CapturePoint
        {
-            public const string CAPTURE_POINT_PATH = "Assets/Art_Out/Other/CapturePoint/capture_point_progress.prefab";
-            public const string CAPTURE_FINISHED_POINT_PATH = "Assets/Art_Out/Other/CapturePoint/capture_point_end.prefab";
+            public const string CAPTURE_POINT_PROGRESS_PATH = "Assets/Art_Out/Other/CapturePoint/capture_point_progress.prefab";
+            public const string CAPTURE_POINT_GROUND_POINT_PATH = "Assets/Art_Out/Other/CapturePoint/Zhanling_dige.prefab";
+            public const string CAPTURE_EFFECT_ICON_PATH = "Assets/Art_Out/Other/CapturePoint/Zhanling_zhishi.prefab";
        }

        public static class HoldFlag
--- a/ProjectNLD/Assets/Code/Scripts/Gameplay/Fight/Capture/CaptureInst.cs
+++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Fight/Capture/CaptureInst.cs
@ -2,6 +2,7 @@
 using Framework;
 using Gameplay.Area;
 using Gameplay.Common;
+using Gameplay.Effect;
 using Gameplay.Unit;
 using Gameplay.Utils;
 using PhxhSDK;
@ -11,53 +12,100 @@ namespace Gameplay.Fight.Capture
 {
    public class CaptureInst
    {
-        private static readonly int _Prop_Color1 = Shader.PropertyToID("_BaseColor");
+        private static readonly int _Prop_BaseMap = Shader.PropertyToID("_BaseMap");

        public int cellIndex;
+        private Vector3 _worldPos;

        public int maxCaptureProgress = 10;

        public List<GameUnit> inAreaUnits;

        public float captureProgress;
-        
+
        private bool _lastIsInArea;

        public bool isCaptured { get; private set; }

-        private GameObject _displayObj;
-
        private Material _displayMat;

-        private Color _startColor;
-        private Color _endColor;
-        
-        public CaptureInst(int cellIndex, int captureValue)
+        private GameObject _displayObj;
+        private GameObject _objGroundPoint;
+        private GameObject _objIcon;
+
+        private bool _isEntered;
+
+        public CaptureInst(int cellIndex,
+            int captureValue)
        {
            maxCaptureProgress = captureValue;
            this.cellIndex = cellIndex;
            inAreaUnits = new List<GameUnit>();
            captureProgress = 0f;
            isCaptured = false;
-            var sampleObj = AssetManager.Instance.GetPreLoadResult<GameObject>(PathDefine.CapturePoint.CAPTURE_POINT_PATH);
-            _displayObj = Object.Instantiate(sampleObj);
-            var worldPos = AreaManager.instance.GetWorldPosByIndex(cellIndex);
-            _displayObj.transform.position = worldPos;
+            _isEntered = false;
+
            _lastIsInArea = false;

-            _startColor = ColorEx.FromStr("#FFFFFF");
-            _endColor = ColorEx.FromStr("#D4FF7E");
+            _CreateObjs();
+        }
+
+        private void _CreateProgressObj(Vector3 worldPos)
+        {
+            var sampleObj = AssetManager.Instance.GetPreLoadResult<GameObject>(PathDefine.CapturePoint.CAPTURE_POINT_PROGRESS_PATH);
+            _displayObj = Object.Instantiate(sampleObj);
+            _displayObj.transform.position = worldPos;
            _SearchDisplayMat();
        }
-        
+
+        private void _CreateObjs()
+        {
+            _worldPos = AreaManager.instance.GetWorldPosByIndex(cellIndex);
+            {
+                var sampleObj = AssetManager.Instance.GetPreLoadResult<GameObject>(PathDefine.CapturePoint.CAPTURE_POINT_GROUND_POINT_PATH);
+                _objGroundPoint = Object.Instantiate(sampleObj);
+                _objGroundPoint.transform.position = _worldPos;
+            }
+            {
+                var sampleObj = AssetManager.Instance.GetPreLoadResult<GameObject>(PathDefine.CapturePoint.CAPTURE_EFFECT_ICON_PATH);
+                _objIcon = Object.Instantiate(sampleObj);
+                _objIcon.transform.position = _worldPos;
+            }
+
+        }
+
+        private void _DestroyObjs()
+        {
+            if (_displayObj != null)
+            {
+                _displayObj.Destroy();
+                _displayObj = null;
+            }
+            if (_objGroundPoint != null)
+            {
+                _objGroundPoint.Destroy();
+                _objGroundPoint = null;
+            }
+            _DestroyIcon();
+        }
+
+        private void _DestroyIcon()
+        {
+            if (_objIcon != null)
+            {
+                _objIcon.Destroy();
+                _objIcon = null;
+            }
+        }
+
        private void _SearchDisplayMat()
        {
-            var findTrans = _displayObj.transform.GetChild(0);
-            var meshRender = findTrans.GetComponent<MeshRenderer>();
-            _displayMat = meshRender.material;
-            _displayMat.SetColor(_Prop_Color1, _startColor);
+            var findTrans = _displayObj.transform.Find("lizi/liubian_dutiao");
+            var particleSystem = findTrans.GetComponent<ParticleSystemRenderer>();
+            _displayMat = particleSystem.material;
+            _displayMat.SetTextureOffset(_Prop_BaseMap, new Vector2(0, 0));
        }
-        
+
        public void UpdateInAreaUnits(List<GameUnit> checkUnits)
        {
            if (isCaptured) return;
@ -70,31 +118,37 @@ namespace Gameplay.Fight.Capture
                inAreaUnits.Add(unit);
            }
        }
-        
+
        public void LogicUpdate(float dt)
        {
            if (isCaptured) return;
            if (inAreaUnits.Count > 0)
            {
+                if (!_isEntered)
+                {
+                    _isEntered = true;
+                    _DestroyIcon();
+                    _CreateProgressObj(_worldPos);
+                }
+
                captureProgress += dt * inAreaUnits.Count;
                if (captureProgress >= maxCaptureProgress)
                {
                    isCaptured = true;
                    EventManager.Instance.Send(EventManager.EventName.INFIGHT_CAPTURE_FINSIHED, this);
-
-                    _CreateNoticeOnGround();
-                }
-                else
-                {
-                    var lerpValue = captureProgress / maxCaptureProgress;
-                    var lerpColor = Color.Lerp(_startColor, _endColor, lerpValue);
-                    _displayMat.SetColor(_Prop_Color1, lerpColor);
+                    EffectManager.instance.PlayEffectById(CodeDefine.Fight.CapturePoint.EFFECT_ID_FINISH, _worldPos);
+                    _DestroyObjs();
+                    return;
                }
+                var lerpValue = captureProgress / maxCaptureProgress;
+                _displayMat.SetTextureOffset(_Prop_BaseMap, new Vector2(lerpValue, 0));

                if (!_lastIsInArea)
                {
                    _lastIsInArea = true;
                    EventManager.Instance.Send(EventManager.EventName.INFIGHT_CAPTURE_START, this);
+                    
+                    EffectManager.instance.PlayEffectById(CodeDefine.Fight.CapturePoint.EFFECT_ID_EXIT, _worldPos);
                }
            }
            else
@ -103,28 +157,16 @@ namespace Gameplay.Fight.Capture
                {
                    _lastIsInArea = false;
                    EventManager.Instance.Send(EventManager.EventName.INFIGHT_CAPTURE_STOP, this);
+                    
+                    EffectManager.instance.PlayEffectById(CodeDefine.Fight.CapturePoint.EFFECT_ID_EXIT, _worldPos);
                }
            }
-            
-        }

-        private void _CreateNoticeOnGround()
-        {
-            var sampleObj = AssetManager.Instance.GetPreLoadResult<GameObject>(PathDefine.CapturePoint.CAPTURE_FINISHED_POINT_PATH);
-            var displayObj = Object.Instantiate(sampleObj);
-            var worldPos = _displayObj.transform.position;
-            displayObj.transform.position = worldPos;
-            _displayObj.Destroy();
-            _displayObj = displayObj;
        }

        public void Dispose()
        {
-            if (_displayObj != null)
-            {
-                _displayObj.Destroy();
-                _displayObj = null;
-            }
+            _DestroyObjs();
        }
    }
 }
--- a/ProjectNLD/Assets/Code/Scripts/Gameplay/Level/Level.cs
+++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Level/Level.cs
@ -663,8 +663,12 @@ namespace Gameplay.Level
            _PostPreload(PathDefine.Summon.ENEMY);
            _PostPreload(PathDefine.SkillArea.SKILL_GORUND_HIGH_LIGHT);
            _PostPreload(PathDefine.SkillArea.HIGHLIGHT_POINT);
-            _PostPreload(PathDefine.CapturePoint.CAPTURE_POINT_PATH);
-            _PostPreload(PathDefine.CapturePoint.CAPTURE_FINISHED_POINT_PATH);
+            
+            // 占领相关
+            _PostPreload(PathDefine.CapturePoint.CAPTURE_POINT_PROGRESS_PATH);
+            _PostPreload(PathDefine.CapturePoint.CAPTURE_POINT_GROUND_POINT_PATH);
+            _PostPreload(PathDefine.CapturePoint.CAPTURE_EFFECT_ICON_PATH);
+            
            _PostPreload(PathDefine.HoldFlag.FLAG_GROUND_PATH);
            _PostPreload(PathDefine.HoldFlag.FLAG_PICK_PATH);
            _PostPreload(PathDefine.HoldFlag.FLAG_RETURN_PATH);
--- a/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/ActorCfg/UnlockParam.cs
+++ b/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/ActorCfg/UnlockParam.cs
@ -23,6 +23,14 @@ namespace cfg.ActorCfg
        /// 角色ID
        /// </summary>
        CharacterID = 1,
+        /// <summary>
+        /// 载具ID
+        /// </summary>
+        VehicleID = 1,
+        /// <summary>
+        /// 载具部件ID
+        /// </summary>
+        VehicleComponentID = 2,
    }

 } 
--- a/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/ChargeCfg/DataCurrencyShopCfg.cs
+++ b/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/ChargeCfg/DataCurrencyShopCfg.cs
@ -20,6 +20,7 @@ public sealed partial class DataCurrencyShopCfg :  Bright.Config.BeanBase
    {
        { if(!_json["Id"].IsNumber) { throw new SerializationException(); }  Id = _json["Id"]; }
        { if(!_json["AppleProductID"].IsString) { throw new SerializationException(); }  AppleProductID = _json["AppleProductID"]; }
+        { if(!_json["PhxhProductID"].IsString) { throw new SerializationException(); }  PhxhProductID = _json["PhxhProductID"]; }
        { if(!_json["AppleBuyType"].IsNumber) { throw new SerializationException(); }  AppleBuyType = (ChargeCfg.AppleBuyType)_json["AppleBuyType"].AsInt; }
        { if(!_json["Name"].IsString) { throw new SerializationException(); }  Name = _json["Name"]; }
        { if(!_json["NameLocal"].IsString) { throw new SerializationException(); }  NameLocal = _json["NameLocal"]; }
@ -32,10 +33,11 @@ public sealed partial class DataCurrencyShopCfg :  Bright.Config.BeanBase
        PostInit();
    }

-    public DataCurrencyShopCfg(int Id, string AppleProductID, ChargeCfg.AppleBuyType AppleBuyType, string Name, string NameLocal, int ItemID, int ItemCount, int MaxCount, int NowPriceDollar, int NowPriceRMB, string IconPath ) 
+    public DataCurrencyShopCfg(int Id, string AppleProductID, string PhxhProductID, ChargeCfg.AppleBuyType AppleBuyType, string Name, string NameLocal, int ItemID, int ItemCount, int MaxCount, int NowPriceDollar, int NowPriceRMB, string IconPath ) 
    {
        this.Id = Id;
        this.AppleProductID = AppleProductID;
+        this.PhxhProductID = PhxhProductID;
        this.AppleBuyType = AppleBuyType;
        this.Name = Name;
        this.NameLocal = NameLocal;
@ -62,6 +64,10 @@ public sealed partial class DataCurrencyShopCfg :  Bright.Config.BeanBase
    /// </summary>
    public string AppleProductID { get; private set; }
    /// <summary>
+    /// 开放平台ID
+    /// </summary>
+    public string PhxhProductID { get; private set; }
+    /// <summary>
    /// 类型
    /// </summary>
    public ChargeCfg.AppleBuyType AppleBuyType { get; private set; }
@ -115,6 +121,7 @@ public sealed partial class DataCurrencyShopCfg :  Bright.Config.BeanBase
        return "{ "
        + "Id:" + Id + ","
        + "AppleProductID:" + AppleProductID + ","
+        + "PhxhProductID:" + PhxhProductID + ","
        + "AppleBuyType:" + AppleBuyType + ","
        + "Name:" + Name + ","
        + "NameLocal:" + NameLocal + ","
--- a/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/ConditionType.cs
+++ b/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/ConditionType.cs
@ -96,9 +96,17 @@ namespace cfg
        /// </summary>
        LevelOver = 20,
        /// <summary>
+        /// 载具是否解锁
+        /// </summary>
+        VehicleIsUnlock = 21,
+        /// <summary>
+        /// 载具部件是否解锁
+        /// </summary>
+        VehicleComponentIsUnlock = 22,
+        /// <summary>
        ///  最大类型
        /// </summary>
-        Max = 21,
+        Max = 23,
    }

 } 
--- a/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/DataCondition.cs
+++ b/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/DataCondition.cs
@ -26,7 +26,7 @@ public sealed partial class DataCondition :  Bright.Config.BeanBase
        PostInit();
    }

-    public DataCondition(int Id, ConditionType Type, int Param1, int Param2, int Param3 ) 
+    public DataCondition(int Id, ConditionType Type, long Param1, long Param2, int Param3 ) 
    {
        this.Id = Id;
        this.Type = Type;
@ -52,11 +52,11 @@ public sealed partial class DataCondition :  Bright.Config.BeanBase
    /// <summary>
    /// 参数1
    /// </summary>
-    public int Param1 { get; private set; }
+    public long Param1 { get; private set; }
    /// <summary>
    /// 参数2
    /// </summary>
-    public int Param2 { get; private set; }
+    public long Param2 { get; private set; }
    /// <summary>
    /// 参数3
    /// </summary>
--- a/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/VehicleCfg/DataVehicle.cs
+++ b/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/VehicleCfg/DataVehicle.cs
@ -24,6 +24,7 @@ public sealed partial class DataVehicle :  Bright.Config.BeanBase
        { if(!_json["Name"].IsString) { throw new SerializationException(); }  Name = _json["Name"]; }
        { if(!_json["UnlockType"].IsNumber) { throw new SerializationException(); }  UnlockType = (VihecleCultivateCfg.UnlockType)_json["UnlockType"].AsInt; }
        { var __json0 = _json["UnlockCost"]; if(!__json0.IsArray) { throw new SerializationException(); } UnlockCost = new System.Collections.Generic.List<item.ItemCounts>(__json0.Count); foreach(JSONNode __e0 in __json0.Children) { item.ItemCounts __v0;  { if(!__e0.IsObject) { throw new SerializationException(); }  __v0 = item.ItemCounts.DeserializeItemCounts(__e0);  }  UnlockCost.Add(__v0); }   }
+        { var __json0 = _json["UnlockID"]; if(!__json0.IsArray) { throw new SerializationException(); } int _n0 = __json0.Count; UnlockID = new int[_n0]; int __index0=0; foreach(JSONNode __e0 in __json0.Children) { int __v0;  { if(!__e0.IsNumber) { throw new SerializationException(); }  __v0 = __e0; }  UnlockID[__index0++] = __v0; }   }
        { if(!_json["ParentType"].IsNumber) { throw new SerializationException(); }  ParentType = (VihecleCultivateCfg.ParentType)_json["ParentType"].AsInt; }
        { if(!_json["ParentId"].IsNumber) { throw new SerializationException(); }  ParentId = _json["ParentId"]; }
        { if(!_json["UIHeadPath"].IsString) { throw new SerializationException(); }  UIHeadPath = _json["UIHeadPath"]; }
@ -52,7 +53,7 @@ public sealed partial class DataVehicle :  Bright.Config.BeanBase
        PostInit();
    }

-    public DataVehicle(int ID, VihecleCultivateCfg.VehicleType VehicleType, int VehicleLevel, string Name, VihecleCultivateCfg.UnlockType UnlockType, System.Collections.Generic.List<item.ItemCounts> UnlockCost, VihecleCultivateCfg.ParentType ParentType, long ParentId, string UIHeadPath, string PrefabPath, string ReadyAudioId, string IdleLoopAudioId, string WalkStopAudioId, string WalkLoopAudioId, string DeadAudioId, int DeadEffectId, int StandCrossLevel, int MoveCrossLevel, int SeatCount, int Defense, int HP, int ShieldCount, int WeaponId, float MoveSpeed, float TurnSpeed, float CriticalRate, float CriticalScale, System.Collections.Generic.List<FightCfg.ELevelTerrainType> MalaAdjustTerrain, System.Collections.Generic.List<FightCfg.ELevelTerrainType> SupperAdjustTerrain, int SpendLeadership, string Icon ) 
+    public DataVehicle(int ID, VihecleCultivateCfg.VehicleType VehicleType, int VehicleLevel, string Name, VihecleCultivateCfg.UnlockType UnlockType, System.Collections.Generic.List<item.ItemCounts> UnlockCost, int[] UnlockID, VihecleCultivateCfg.ParentType ParentType, long ParentId, string UIHeadPath, string PrefabPath, string ReadyAudioId, string IdleLoopAudioId, string WalkStopAudioId, string WalkLoopAudioId, string DeadAudioId, int DeadEffectId, int StandCrossLevel, int MoveCrossLevel, int SeatCount, int Defense, int HP, int ShieldCount, int WeaponId, float MoveSpeed, float TurnSpeed, float CriticalRate, float CriticalScale, System.Collections.Generic.List<FightCfg.ELevelTerrainType> MalaAdjustTerrain, System.Collections.Generic.List<FightCfg.ELevelTerrainType> SupperAdjustTerrain, int SpendLeadership, string Icon ) 
    {
        this.ID = ID;
        this.VehicleType = VehicleType;
@ -60,6 +61,7 @@ public sealed partial class DataVehicle :  Bright.Config.BeanBase
        this.Name = Name;
        this.UnlockType = UnlockType;
        this.UnlockCost = UnlockCost;
+        this.UnlockID = UnlockID;
        this.ParentType = ParentType;
        this.ParentId = ParentId;
        this.UIHeadPath = UIHeadPath;
@ -118,6 +120,10 @@ public sealed partial class DataVehicle :  Bright.Config.BeanBase
    /// </summary>
    public System.Collections.Generic.List<item.ItemCounts> UnlockCost { get; private set; }
    /// <summary>
+    /// 解锁条件
+    /// </summary>
+    public int[] UnlockID { get; private set; }
+    /// <summary>
    /// 前置类型（部件1，其他2）
    /// </summary>
    public VihecleCultivateCfg.ParentType ParentType { get; private set; }
@ -241,6 +247,7 @@ public sealed partial class DataVehicle :  Bright.Config.BeanBase
        + "Name:" + Name + ","
        + "UnlockType:" + UnlockType + ","
        + "UnlockCost:" + Bright.Common.StringUtil.CollectionToString(UnlockCost) + ","
+        + "UnlockID:" + Bright.Common.StringUtil.CollectionToString(UnlockID) + ","
        + "ParentType:" + ParentType + ","
        + "ParentId:" + ParentId + ","
        + "UIHeadPath:" + UIHeadPath + ","
--- a/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/VihecleCultivateCfg/DataVehicleComponent.cs
+++ b/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/VihecleCultivateCfg/DataVehicleComponent.cs
@ -22,6 +22,7 @@ public sealed partial class DataVehicleComponent :  Bright.Config.BeanBase
        { if(!_json["ComponentName"].IsString) { throw new SerializationException(); }  ComponentName = _json["ComponentName"]; }
        { if(!_json["ComponentType"].IsNumber) { throw new SerializationException(); }  ComponentType = (VihecleCultivateCfg.ComponentType)_json["ComponentType"].AsInt; }
        { var __json0 = _json["UpgradeCost"]; if(!__json0.IsArray) { throw new SerializationException(); } UpgradeCost = new System.Collections.Generic.List<item.ItemCounts>(__json0.Count); foreach(JSONNode __e0 in __json0.Children) { item.ItemCounts __v0;  { if(!__e0.IsObject) { throw new SerializationException(); }  __v0 = item.ItemCounts.DeserializeItemCounts(__e0);  }  UpgradeCost.Add(__v0); }   }
+        { var __json0 = _json["UnlockID"]; if(!__json0.IsArray) { throw new SerializationException(); } int _n0 = __json0.Count; UnlockID = new int[_n0]; int __index0=0; foreach(JSONNode __e0 in __json0.Children) { int __v0;  { if(!__e0.IsNumber) { throw new SerializationException(); }  __v0 = __e0; }  UnlockID[__index0++] = __v0; }   }
        { if(!_json["ParentComponentID"].IsNumber) { throw new SerializationException(); }  ParentComponentID = _json["ParentComponentID"]; }
        { if(!_json["VehicleID"].IsNumber) { throw new SerializationException(); }  VehicleID = _json["VehicleID"]; }
        { if(!_json["Icon"].IsString) { throw new SerializationException(); }  Icon = _json["Icon"]; }
@ -38,12 +39,13 @@ public sealed partial class DataVehicleComponent :  Bright.Config.BeanBase
        PostInit();
    }

-    public DataVehicleComponent(long ComponentID, string ComponentName, VihecleCultivateCfg.ComponentType ComponentType, System.Collections.Generic.List<item.ItemCounts> UpgradeCost, long ParentComponentID, int VehicleID, string Icon, int Damage, int Defense, int HP, float ReloadTime, float FireRate, int MoraleDamage, float ScaleForHuman, float ScaleForVehicle, float CriticalRate, float CriticalScale ) 
+    public DataVehicleComponent(long ComponentID, string ComponentName, VihecleCultivateCfg.ComponentType ComponentType, System.Collections.Generic.List<item.ItemCounts> UpgradeCost, int[] UnlockID, long ParentComponentID, int VehicleID, string Icon, int Damage, int Defense, int HP, float ReloadTime, float FireRate, int MoraleDamage, float ScaleForHuman, float ScaleForVehicle, float CriticalRate, float CriticalScale ) 
    {
        this.ComponentID = ComponentID;
        this.ComponentName = ComponentName;
        this.ComponentType = ComponentType;
        this.UpgradeCost = UpgradeCost;
+        this.UnlockID = UnlockID;
        this.ParentComponentID = ParentComponentID;
        this.VehicleID = VehicleID;
        this.Icon = Icon;
@ -82,6 +84,10 @@ public sealed partial class DataVehicleComponent :  Bright.Config.BeanBase
    /// </summary>
    public System.Collections.Generic.List<item.ItemCounts> UpgradeCost { get; private set; }
    /// <summary>
+    /// 解锁条件
+    /// </summary>
+    public int[] UnlockID { get; private set; }
+    /// <summary>
    /// 父部件id
    /// </summary>
    public long ParentComponentID { get; private set; }
@ -155,6 +161,7 @@ public sealed partial class DataVehicleComponent :  Bright.Config.BeanBase
        + "ComponentName:" + ComponentName + ","
        + "ComponentType:" + ComponentType + ","
        + "UpgradeCost:" + Bright.Common.StringUtil.CollectionToString(UpgradeCost) + ","
+        + "UnlockID:" + Bright.Common.StringUtil.CollectionToString(UnlockID) + ","
        + "ParentComponentID:" + ParentComponentID + ","
        + "VehicleID:" + VehicleID + ","
        + "Icon:" + Icon + ","
--- a/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/VihecleCultivateCfg/DataVehiclePaint.cs
+++ b/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/VihecleCultivateCfg/DataVehiclePaint.cs
@ -30,11 +30,12 @@ public sealed partial class DataVehiclePaint :  Bright.Config.BeanBase
        { if(!_json["CriticalRate"].IsNumber) { throw new SerializationException(); }  CriticalRate = _json["CriticalRate"]; }
        { if(!_json["CriticalScale"].IsNumber) { throw new SerializationException(); }  CriticalScale = _json["CriticalScale"]; }
        { if(!_json["UnlockType"].IsNumber) { throw new SerializationException(); }  UnlockType = (VihecleCultivateCfg.PaintIUnlockType)_json["UnlockType"].AsInt; }
+        { if(!_json["ItemID"].IsNumber) { throw new SerializationException(); }  ItemID = _json["ItemID"]; }
        { var __json0 = _json["PaintCost"]; if(!__json0.IsArray) { throw new SerializationException(); } PaintCost = new System.Collections.Generic.List<item.ItemCounts>(__json0.Count); foreach(JSONNode __e0 in __json0.Children) { item.ItemCounts __v0;  { if(!__e0.IsObject) { throw new SerializationException(); }  __v0 = item.ItemCounts.DeserializeItemCounts(__e0);  }  PaintCost.Add(__v0); }   }
        PostInit();
    }

-    public DataVehiclePaint(int PaintID, string PaintName, VihecleCultivateCfg.PaintType PaintType, int HostVehicle, int Damage, int Defense, int HP, float ScaleForHuman, float ScaleForVehicle, float CriticalRate, float CriticalScale, VihecleCultivateCfg.PaintIUnlockType UnlockType, System.Collections.Generic.List<item.ItemCounts> PaintCost ) 
+    public DataVehiclePaint(int PaintID, string PaintName, VihecleCultivateCfg.PaintType PaintType, int HostVehicle, int Damage, int Defense, int HP, float ScaleForHuman, float ScaleForVehicle, float CriticalRate, float CriticalScale, VihecleCultivateCfg.PaintIUnlockType UnlockType, int ItemID, System.Collections.Generic.List<item.ItemCounts> PaintCost ) 
    {
        this.PaintID = PaintID;
        this.PaintName = PaintName;
@ -48,6 +49,7 @@ public sealed partial class DataVehiclePaint :  Bright.Config.BeanBase
        this.CriticalRate = CriticalRate;
        this.CriticalScale = CriticalScale;
        this.UnlockType = UnlockType;
+        this.ItemID = ItemID;
        this.PaintCost = PaintCost;
        PostInit();
    }
@ -105,6 +107,7 @@ public sealed partial class DataVehiclePaint :  Bright.Config.BeanBase
    /// 获取方式
    /// </summary>
    public VihecleCultivateCfg.PaintIUnlockType UnlockType { get; private set; }
+    public int ItemID { get; private set; }
    /// <summary>
    /// 涂装消耗
    /// </summary>
@ -139,6 +142,7 @@ public sealed partial class DataVehiclePaint :  Bright.Config.BeanBase
        + "CriticalRate:" + CriticalRate + ","
        + "CriticalScale:" + CriticalScale + ","
        + "UnlockType:" + UnlockType + ","
+        + "ItemID:" + ItemID + ","
        + "PaintCost:" + Bright.Common.StringUtil.CollectionToString(PaintCost) + ","
        + "}";
    }
--- a/ProjectNLD/Assets/Config/Data/Localize/CN/stringcfg_stringconfig.json
+++ b/ProjectNLD/Assets/Config/Data/Localize/CN/stringcfg_stringconfig.json
--- a/ProjectNLD/Assets/Config/Data/Localize/EN/stringcfg_stringconfig.json
+++ b/ProjectNLD/Assets/Config/Data/Localize/EN/stringcfg_stringconfig.json
--- a/ProjectNLD/Assets/Config/Data/actorcfg_item.json
+++ b/ProjectNLD/Assets/Config/Data/actorcfg_item.json
@ -11444,8 +11444,8 @@
  },
  {
    "ID": 21,
-    "Type": 5,
-    "NameLocal": "丛林猎手",
+    "Type": 1,
+    "NameLocal": "",
    "Param1": 1000,
    "Param2": 0,
    "Param3": 0,
@ -11467,8 +11467,8 @@
  },
  {
    "ID": 22,
-    "Type": 5,
-    "NameLocal": "毒藤",
+    "Type": 1,
+    "NameLocal": "",
    "Param1": 2000,
    "Param2": 0,
    "Param3": 0,
@ -11490,8 +11490,8 @@
  },
  {
    "ID": 23,
-    "Type": 5,
-    "NameLocal": "丛林伪装",
+    "Type": 1,
+    "NameLocal": "",
    "Param1": 3000,
    "Param2": 0,
    "Param3": 0,
@ -11513,8 +11513,8 @@
  },
  {
    "ID": 24,
-    "Type": 5,
-    "NameLocal": "圣诞狂欢",
+    "Type": 1,
+    "NameLocal": "",
    "Param1": 1001,
    "Param2": 0,
    "Param3": 0,
@ -11536,8 +11536,8 @@
  },
  {
    "ID": 25,
-    "Type": 5,
-    "NameLocal": "糖果Pro",
+    "Type": 1,
+    "NameLocal": "",
    "Param1": 2001,
    "Param2": 0,
    "Param3": 0,
@ -11559,8 +11559,8 @@
  },
  {
    "ID": 26,
-    "Type": 5,
-    "NameLocal": "麋鹿奔跑",
+    "Type": 1,
+    "NameLocal": "",
    "Param1": 3001,
    "Param2": 0,
    "Param3": 0,
@ -11580,6 +11580,351 @@
    "Acquisition": [],
    "ExchangeParam": []
  },
+  {
+    "ID": 27,
+    "Type": 1,
+    "NameLocal": "",
+    "Param1": 1002,
+    "Param2": 0,
+    "Param3": 0,
+    "Rarity": 0,
+    "BatchUsing": false,
+    "MaxCount": 0,
+    "IconPath": "Assets/Art/UI/Texture/Icon/MaterialFragment/Icon_300007.png",
+    "CoinIconPath": "",
+    "Selections": [],
+    "MaxUseCount": 0,
+    "ExpireTransfor": 0,
+    "ShowInStorage": true,
+    "StorageType": 2,
+    "IntroductionKey": "",
+    "JumpToPos": 0,
+    "JumpToParam": 0,
+    "Acquisition": [],
+    "ExchangeParam": []
+  },
+  {
+    "ID": 28,
+    "Type": 1,
+    "NameLocal": "",
+    "Param1": 2002,
+    "Param2": 0,
+    "Param3": 0,
+    "Rarity": 0,
+    "BatchUsing": false,
+    "MaxCount": 0,
+    "IconPath": "Assets/Art/UI/Texture/Icon/MaterialFragment/Icon_300008.png",
+    "CoinIconPath": "",
+    "Selections": [],
+    "MaxUseCount": 0,
+    "ExpireTransfor": 0,
+    "ShowInStorage": true,
+    "StorageType": 2,
+    "IntroductionKey": "",
+    "JumpToPos": 0,
+    "JumpToParam": 0,
+    "Acquisition": [],
+    "ExchangeParam": []
+  },
+  {
+    "ID": 29,
+    "Type": 1,
+    "NameLocal": "",
+    "Param1": 3002,
+    "Param2": 0,
+    "Param3": 0,
+    "Rarity": 0,
+    "BatchUsing": false,
+    "MaxCount": 0,
+    "IconPath": "Assets/Art/UI/Texture/Icon/MaterialFragment/Icon_300009.png",
+    "CoinIconPath": "",
+    "Selections": [],
+    "MaxUseCount": 0,
+    "ExpireTransfor": 0,
+    "ShowInStorage": true,
+    "StorageType": 2,
+    "IntroductionKey": "",
+    "JumpToPos": 0,
+    "JumpToParam": 0,
+    "Acquisition": [],
+    "ExchangeParam": []
+  },
+  {
+    "ID": 30,
+    "Type": 1,
+    "NameLocal": "",
+    "Param1": 1003,
+    "Param2": 0,
+    "Param3": 0,
+    "Rarity": 0,
+    "BatchUsing": false,
+    "MaxCount": 0,
+    "IconPath": "Assets/Art/UI/Texture/Icon/MaterialFragment/Icon_300010.png",
+    "CoinIconPath": "",
+    "Selections": [],
+    "MaxUseCount": 0,
+    "ExpireTransfor": 0,
+    "ShowInStorage": true,
+    "StorageType": 2,
+    "IntroductionKey": "",
+    "JumpToPos": 0,
+    "JumpToParam": 0,
+    "Acquisition": [],
+    "ExchangeParam": []
+  },
+  {
+    "ID": 31,
+    "Type": 1,
+    "NameLocal": "",
+    "Param1": 2003,
+    "Param2": 0,
+    "Param3": 0,
+    "Rarity": 0,
+    "BatchUsing": false,
+    "MaxCount": 0,
+    "IconPath": "Assets/Art/UI/Texture/Icon/MaterialFragment/Icon_300011.png",
+    "CoinIconPath": "",
+    "Selections": [],
+    "MaxUseCount": 0,
+    "ExpireTransfor": 0,
+    "ShowInStorage": true,
+    "StorageType": 2,
+    "IntroductionKey": "",
+    "JumpToPos": 0,
+    "JumpToParam": 0,
+    "Acquisition": [],
+    "ExchangeParam": []
+  },
+  {
+    "ID": 32,
+    "Type": 1,
+    "NameLocal": "",
+    "Param1": 3003,
+    "Param2": 0,
+    "Param3": 0,
+    "Rarity": 0,
+    "BatchUsing": false,
+    "MaxCount": 0,
+    "IconPath": "Assets/Art/UI/Texture/Icon/MaterialFragment/Icon_300012.png",
+    "CoinIconPath": "",
+    "Selections": [],
+    "MaxUseCount": 0,
+    "ExpireTransfor": 0,
+    "ShowInStorage": true,
+    "StorageType": 2,
+    "IntroductionKey": "",
+    "JumpToPos": 0,
+    "JumpToParam": 0,
+    "Acquisition": [],
+    "ExchangeParam": []
+  },
+  {
+    "ID": 33,
+    "Type": 1,
+    "NameLocal": "",
+    "Param1": 1004,
+    "Param2": 0,
+    "Param3": 0,
+    "Rarity": 0,
+    "BatchUsing": false,
+    "MaxCount": 0,
+    "IconPath": "Assets/Art/UI/Texture/Icon/MaterialFragment/Icon_300013.png",
+    "CoinIconPath": "",
+    "Selections": [],
+    "MaxUseCount": 0,
+    "ExpireTransfor": 0,
+    "ShowInStorage": true,
+    "StorageType": 2,
+    "IntroductionKey": "",
+    "JumpToPos": 0,
+    "JumpToParam": 0,
+    "Acquisition": [],
+    "ExchangeParam": []
+  },
+  {
+    "ID": 34,
+    "Type": 1,
+    "NameLocal": "",
+    "Param1": 2004,
+    "Param2": 0,
+    "Param3": 0,
+    "Rarity": 0,
+    "BatchUsing": false,
+    "MaxCount": 0,
+    "IconPath": "Assets/Art/UI/Texture/Icon/MaterialFragment/Icon_300014.png",
+    "CoinIconPath": "",
+    "Selections": [],
+    "MaxUseCount": 0,
+    "ExpireTransfor": 0,
+    "ShowInStorage": true,
+    "StorageType": 2,
+    "IntroductionKey": "",
+    "JumpToPos": 0,
+    "JumpToParam": 0,
+    "Acquisition": [],
+    "ExchangeParam": []
+  },
+  {
+    "ID": 35,
+    "Type": 1,
+    "NameLocal": "",
+    "Param1": 3004,
+    "Param2": 0,
+    "Param3": 0,
+    "Rarity": 0,
+    "BatchUsing": false,
+    "MaxCount": 0,
+    "IconPath": "Assets/Art/UI/Texture/Icon/MaterialFragment/Icon_300015.png",
+    "CoinIconPath": "",
+    "Selections": [],
+    "MaxUseCount": 0,
+    "ExpireTransfor": 0,
+    "ShowInStorage": true,
+    "StorageType": 2,
+    "IntroductionKey": "",
+    "JumpToPos": 0,
+    "JumpToParam": 0,
+    "Acquisition": [],
+    "ExchangeParam": []
+  },
+  {
+    "ID": 36,
+    "Type": 1,
+    "NameLocal": "",
+    "Param1": 1005,
+    "Param2": 0,
+    "Param3": 0,
+    "Rarity": 0,
+    "BatchUsing": false,
+    "MaxCount": 0,
+    "IconPath": "Assets/Art/UI/Texture/Icon/MaterialFragment/Icon_300016.png",
+    "CoinIconPath": "",
+    "Selections": [],
+    "MaxUseCount": 0,
+    "ExpireTransfor": 0,
+    "ShowInStorage": true,
+    "StorageType": 2,
+    "IntroductionKey": "",
+    "JumpToPos": 0,
+    "JumpToParam": 0,
+    "Acquisition": [],
+    "ExchangeParam": []
+  },
+  {
+    "ID": 37,
+    "Type": 1,
+    "NameLocal": "",
+    "Param1": 2005,
+    "Param2": 0,
+    "Param3": 0,
+    "Rarity": 0,
+    "BatchUsing": false,
+    "MaxCount": 0,
+    "IconPath": "Assets/Art/UI/Texture/Icon/MaterialFragment/Icon_300017.png",
+    "CoinIconPath": "",
+    "Selections": [],
+    "MaxUseCount": 0,
+    "ExpireTransfor": 0,
+    "ShowInStorage": true,
+    "StorageType": 2,
+    "IntroductionKey": "",
+    "JumpToPos": 0,
+    "JumpToParam": 0,
+    "Acquisition": [],
+    "ExchangeParam": []
+  },
+  {
+    "ID": 38,
+    "Type": 1,
+    "NameLocal": "",
+    "Param1": 3005,
+    "Param2": 0,
+    "Param3": 0,
+    "Rarity": 0,
+    "BatchUsing": false,
+    "MaxCount": 0,
+    "IconPath": "Assets/Art/UI/Texture/Icon/MaterialFragment/Icon_300018.png",
+    "CoinIconPath": "",
+    "Selections": [],
+    "MaxUseCount": 0,
+    "ExpireTransfor": 0,
+    "ShowInStorage": true,
+    "StorageType": 2,
+    "IntroductionKey": "",
+    "JumpToPos": 0,
+    "JumpToParam": 0,
+    "Acquisition": [],
+    "ExchangeParam": []
+  },
+  {
+    "ID": 39,
+    "Type": 1,
+    "NameLocal": "",
+    "Param1": 1006,
+    "Param2": 0,
+    "Param3": 0,
+    "Rarity": 0,
+    "BatchUsing": false,
+    "MaxCount": 0,
+    "IconPath": "Assets/Art/UI/Texture/Icon/MaterialFragment/Icon_300019.png",
+    "CoinIconPath": "",
+    "Selections": [],
+    "MaxUseCount": 0,
+    "ExpireTransfor": 0,
+    "ShowInStorage": true,
+    "StorageType": 2,
+    "IntroductionKey": "",
+    "JumpToPos": 0,
+    "JumpToParam": 0,
+    "Acquisition": [],
+    "ExchangeParam": []
+  },
+  {
+    "ID": 40,
+    "Type": 1,
+    "NameLocal": "",
+    "Param1": 2006,
+    "Param2": 0,
+    "Param3": 0,
+    "Rarity": 0,
+    "BatchUsing": false,
+    "MaxCount": 0,
+    "IconPath": "Assets/Art/UI/Texture/Icon/MaterialFragment/Icon_300020.png",
+    "CoinIconPath": "",
+    "Selections": [],
+    "MaxUseCount": 0,
+    "ExpireTransfor": 0,
+    "ShowInStorage": true,
+    "StorageType": 2,
+    "IntroductionKey": "",
+    "JumpToPos": 0,
+    "JumpToParam": 0,
+    "Acquisition": [],
+    "ExchangeParam": []
+  },
+  {
+    "ID": 41,
+    "Type": 1,
+    "NameLocal": "",
+    "Param1": 3006,
+    "Param2": 0,
+    "Param3": 0,
+    "Rarity": 0,
+    "BatchUsing": false,
+    "MaxCount": 0,
+    "IconPath": "Assets/Art/UI/Texture/Icon/MaterialFragment/Icon_300021.png",
+    "CoinIconPath": "",
+    "Selections": [],
+    "MaxUseCount": 0,
+    "ExpireTransfor": 0,
+    "ShowInStorage": true,
+    "StorageType": 2,
+    "IntroductionKey": "",
+    "JumpToPos": 0,
+    "JumpToParam": 0,
+    "Acquisition": [],
+    "ExchangeParam": []
+  },
  {
    "ID": 1010001,
    "Type": 6,
--- a/ProjectNLD/Assets/Config/Data/charactercfg_characterlevelexp.json
+++ b/ProjectNLD/Assets/Config/Data/charactercfg_characterlevelexp.json
@ -1,7 +1,7 @@
 [
  {
    "Level": 1,
-    "EXP": 1000
+    "EXP": 0
  },
  {
    "Level": 2,
--- a/ProjectNLD/Assets/Config/Data/chargecfg_currencyshopcfg.json
+++ b/ProjectNLD/Assets/Config/Data/chargecfg_currencyshopcfg.json
@ -2,6 +2,7 @@
  {
    "Id": 1,
    "AppleProductID": "Try_Consumable_099_15",
+    "PhxhProductID": "Phxh_Try_Consumable_099_15",
    "AppleBuyType": 0,
    "Name": "测试消耗品1",
    "NameLocal": "CurrencyShop_GoodsName_001",
@ -15,6 +16,7 @@
  {
    "Id": 2,
    "AppleProductID": "Try_Consumable_099_16",
+    "PhxhProductID": "Phxh_Try_Consumable_099_16",
    "AppleBuyType": 0,
    "Name": "测试消耗品2",
    "NameLocal": "CurrencyShop_GoodsName_002",
@ -28,6 +30,7 @@
  {
    "Id": 3,
    "AppleProductID": "Try_Consumable_099_17",
+    "PhxhProductID": "Phxh_Try_Consumable_099_17",
    "AppleBuyType": 0,
    "Name": "测试消耗品3",
    "NameLocal": "CurrencyShop_GoodsName_003",
@ -41,6 +44,7 @@
  {
    "Id": 4,
    "AppleProductID": "Test_NonConsumable_099_20",
+    "PhxhProductID": "Phxh_Test_NonConsumable_099_20",
    "AppleBuyType": 1,
    "Name": "测试非消耗品1",
    "NameLocal": "CurrencyShop_GoodsName_004",
@ -54,6 +58,7 @@
  {
    "Id": 5,
    "AppleProductID": "Test_NonConsumable_199_21",
+    "PhxhProductID": "Phxh_Test_NonConsumable_199_21",
    "AppleBuyType": 1,
    "Name": "测试非消耗品2",
    "NameLocal": "CurrencyShop_GoodsName_005",
@ -67,6 +72,7 @@
  {
    "Id": 6,
    "AppleProductID": "",
+    "PhxhProductID": "",
    "AppleBuyType": 0,
    "Name": "测试消耗品4",
    "NameLocal": "CurrencyShop_GoodsName_006",
--- a/ProjectNLD/Assets/Config/Data/conditionconfig.json
+++ b/ProjectNLD/Assets/Config/Data/conditionconfig.json
@ -747,5 +747,124 @@
    "Param1": 412001,
    "Param2": 0,
    "Param3": 0
+  },
+  {
+    "Id": 500000,
+    "Type": 22,
+    "Param1": 300001,
+    "Param2": 3000010102,
+    "Param3": 0
+  },
+  {
+    "Id": 500001,
+    "Type": 22,
+    "Param1": 300004,
+    "Param2": 3000040103,
+    "Param3": 0
+  },
+  {
+    "Id": 500002,
+    "Type": 22,
+    "Param1": 300001,
+    "Param2": 3000010101,
+    "Param3": 0
+  },
+  {
+    "Id": 500003,
+    "Type": 22,
+    "Param1": 300001,
+    "Param2": 3000010301,
+    "Param3": 0
+  },
+  {
+    "Id": 500004,
+    "Type": 22,
+    "Param1": 300004,
+    "Param2": 3000040101,
+    "Param3": 0
+  },
+  {
+    "Id": 500005,
+    "Type": 22,
+    "Param1": 300004,
+    "Param2": 3000040102,
+    "Param3": 0
+  },
+  {
+    "Id": 500006,
+    "Type": 22,
+    "Param1": 300008,
+    "Param2": 3000080101,
+    "Param3": 0
+  },
+  {
+    "Id": 500007,
+    "Type": 22,
+    "Param1": 300010,
+    "Param2": 3000100101,
+    "Param3": 0
+  },
+  {
+    "Id": 500008,
+    "Type": 22,
+    "Param1": 300010,
+    "Param2": 3000100301,
+    "Param3": 0
+  },
+  {
+    "Id": 500009,
+    "Type": 22,
+    "Param1": 300014,
+    "Param2": 3000140101,
+    "Param3": 0
+  },
+  {
+    "Id": 500010,
+    "Type": 22,
+    "Param1": 300014,
+    "Param2": 3000140301,
+    "Param3": 0
+  },
+  {
+    "Id": 500011,
+    "Type": 22,
+    "Param1": 310001,
+    "Param2": 3100010101,
+    "Param3": 0
+  },
+  {
+    "Id": 500012,
+    "Type": 22,
+    "Param1": 310001,
+    "Param2": 3100010102,
+    "Param3": 0
+  },
+  {
+    "Id": 500013,
+    "Type": 22,
+    "Param1": 320001,
+    "Param2": 3200010101,
+    "Param3": 0
+  },
+  {
+    "Id": 500014,
+    "Type": 22,
+    "Param1": 320001,
+    "Param2": 3200010102,
+    "Param3": 0
+  },
+  {
+    "Id": 500015,
+    "Type": 22,
+    "Param1": 330001,
+    "Param2": 3300010101,
+    "Param3": 0
+  },
+  {
+    "Id": 500016,
+    "Type": 22,
+    "Param1": 330001,
+    "Param2": 3300010102,
+    "Param3": 0
  }
 ]
--- a/ProjectNLD/Assets/Config/Data/effectcfg_effectconfig.json
+++ b/ProjectNLD/Assets/Config/Data/effectcfg_effectconfig.json
@ -1300,5 +1300,19 @@
    "IsUIEffect": false,
    "NeedPreload": true,
    "ExistTime": -1
+  },
+  {
+    "RoleID": 20001,
+    "PrefabPath": "Zhanling_likai",
+    "IsUIEffect": false,
+    "NeedPreload": true,
+    "ExistTime": 5
+  },
+  {
+    "RoleID": 20002,
+    "PrefabPath": "capture_point_end",
+    "IsUIEffect": false,
+    "NeedPreload": true,
+    "ExistTime": 5
  }
 ]
--- a/ProjectNLD/Assets/Config/Data/globalconfig.json
+++ b/ProjectNLD/Assets/Config/Data/globalconfig.json
@ -38,7 +38,7 @@
    "PvpScoreDown": 1,
    "PvpScoreFailed": 20,
    "PvpScoreDefence": 10,
-    "PvpPageCount": 10,
+    "PvpPageCount": 200,
    "PvpCost": {
      "Id": 6,
      "Count": 5
--- a/ProjectNLD/Assets/Config/Data/skillcfg_skillconfig.json
+++ b/ProjectNLD/Assets/Config/Data/skillcfg_skillconfig.json
--- a/ProjectNLD/Assets/Config/Data/stringcfg_stringconfig.json
+++ b/ProjectNLD/Assets/Config/Data/stringcfg_stringconfig.json
@ -18579,6 +18579,16 @@
    "Param1": "",
    "Param2": ""
  },
+  {
+    "Key": "cultivate_LevelUpOutRange",
+    "Name": {
+      "key": "cultivate_LevelUpOutRange",
+      "text": ""
+    },
+    "Param0": "",
+    "Param1": "",
+    "Param2": ""
+  },
  {
    "Key": "cultivate_BreakMaterialNotFull",
    "Name": {
--- a/ProjectNLD/Assets/Config/Data/vehiclecfg_vehicleconfig.json
+++ b/ProjectNLD/Assets/Config/Data/vehiclecfg_vehicleconfig.json
@ -11,6 +11,7 @@
        "Count": 1599
      }
    ],
+    "UnlockID": [],
    "ParentType": 0,
    "ParentId": 0,
    "UIHeadPath": "UI_C00001.png",
@ -54,6 +55,9 @@
        "Count": 2599
      }
    ],
+    "UnlockID": [
+      500000
+    ],
    "ParentType": 1,
    "ParentId": 3000010102,
    "UIHeadPath": "UI_C00004.png",
@ -94,6 +98,9 @@
        "Count": 2899
      }
    ],
+    "UnlockID": [
+      500001
+    ],
    "ParentType": 1,
    "ParentId": 3000040103,
    "UIHeadPath": "UI_C00008.png",
@ -134,6 +141,7 @@
        "Count": 3999
      }
    ],
+    "UnlockID": [],
    "ParentType": 0,
    "ParentId": 0,
    "UIHeadPath": "UI_C00010.png",
@ -174,6 +182,7 @@
        "Count": 300
      }
    ],
+    "UnlockID": [],
    "ParentType": 0,
    "ParentId": 0,
    "UIHeadPath": "UI_C00014.png",
--- a/ProjectNLD/Assets/Config/Data/viheclecultivatecfg_vehiclecomponent.json
+++ b/ProjectNLD/Assets/Config/Data/viheclecultivatecfg_vehiclecomponent.json
@ -9,6 +9,7 @@
        "Count": 50
      }
    ],
+    "UnlockID": [],
    "ParentComponentID": 0,
    "VehicleID": 300001,
    "Icon": "Poster_Component_3000010101.png",
@ -33,6 +34,9 @@
        "Count": 51
      }
    ],
+    "UnlockID": [
+      500002
+    ],
    "ParentComponentID": 3000010101,
    "VehicleID": 300001,
    "Icon": "Poster_Component_3000010102.png",
@ -57,6 +61,7 @@
        "Count": 52
      }
    ],
+    "UnlockID": [],
    "ParentComponentID": 0,
    "VehicleID": 300001,
    "Icon": "Poster_Component_3000010201.png",
@ -81,6 +86,7 @@
        "Count": 53
      }
    ],
+    "UnlockID": [],
    "ParentComponentID": 0,
    "VehicleID": 300001,
    "Icon": "Poster_Component_3000010301.png",
@ -105,6 +111,9 @@
        "Count": 54
      }
    ],
+    "UnlockID": [
+      500003
+    ],
    "ParentComponentID": 3000010301,
    "VehicleID": 300001,
    "Icon": "Poster_Component_3000010302.png",
@ -129,6 +138,7 @@
        "Count": 55
      }
    ],
+    "UnlockID": [],
    "ParentComponentID": 0,
    "VehicleID": 300004,
    "Icon": "Poster_Component_3000040101.png",
@ -153,6 +163,9 @@
        "Count": 56
      }
    ],
+    "UnlockID": [
+      500004
+    ],
    "ParentComponentID": 3000040101,
    "VehicleID": 300004,
    "Icon": "Poster_Component_3000040102.png",
@ -177,6 +190,9 @@
        "Count": 57
      }
    ],
+    "UnlockID": [
+      500005
+    ],
    "ParentComponentID": 3000040102,
    "VehicleID": 300004,
    "Icon": "Poster_Component_3000040103.png",
@ -201,6 +217,7 @@
        "Count": 58
      }
    ],
+    "UnlockID": [],
    "ParentComponentID": 0,
    "VehicleID": 300004,
    "Icon": "Poster_Component_3000040201.png",
@ -225,6 +242,7 @@
        "Count": 59
      }
    ],
+    "UnlockID": [],
    "ParentComponentID": 0,
    "VehicleID": 300004,
    "Icon": "Poster_Component_3000040301.png",
@ -249,6 +267,7 @@
        "Count": 60
      }
    ],
+    "UnlockID": [],
    "ParentComponentID": 0,
    "VehicleID": 300008,
    "Icon": "Poster_Component_3000080101.png",
@ -273,6 +292,9 @@
        "Count": 61
      }
    ],
+    "UnlockID": [
+      500006
+    ],
    "ParentComponentID": 3000080101,
    "VehicleID": 300008,
    "Icon": "Poster_Component_3000080102.png",
@ -297,6 +319,7 @@
        "Count": 62
      }
    ],
+    "UnlockID": [],
    "ParentComponentID": 0,
    "VehicleID": 300008,
    "Icon": "Poster_Component_3000080201.png",
@ -321,6 +344,7 @@
        "Count": 63
      }
    ],
+    "UnlockID": [],
    "ParentComponentID": 0,
    "VehicleID": 300008,
    "Icon": "Poster_Component_3000080301.png",
@ -345,6 +369,7 @@
        "Count": 64
      }
    ],
+    "UnlockID": [],
    "ParentComponentID": 0,
    "VehicleID": 300008,
    "Icon": "Poster_Component_3000080302.png",
@ -369,6 +394,7 @@
        "Count": 65
      }
    ],
+    "UnlockID": [],
    "ParentComponentID": 0,
    "VehicleID": 300010,
    "Icon": "Poster_Component_3000100101.png",
@ -393,6 +419,9 @@
        "Count": 66
      }
    ],
+    "UnlockID": [
+      500007
+    ],
    "ParentComponentID": 3000100101,
    "VehicleID": 300010,
    "Icon": "Poster_Component_3000100102.png",
@ -417,6 +446,7 @@
        "Count": 67
      }
    ],
+    "UnlockID": [],
    "ParentComponentID": 0,
    "VehicleID": 300010,
    "Icon": "Poster_Component_3000100201.png",
@ -441,6 +471,7 @@
        "Count": 68
      }
    ],
+    "UnlockID": [],
    "ParentComponentID": 0,
    "VehicleID": 300010,
    "Icon": "Poster_Component_3000100301.png",
@ -465,6 +496,9 @@
        "Count": 69
      }
    ],
+    "UnlockID": [
+      500008
+    ],
    "ParentComponentID": 3000100301,
    "VehicleID": 300010,
    "Icon": "Poster_Component_3000100302.png",
@ -489,6 +523,7 @@
        "Count": 70
      }
    ],
+    "UnlockID": [],
    "ParentComponentID": 0,
    "VehicleID": 300014,
    "Icon": "Poster_Component_3000140101.png",
@ -513,6 +548,9 @@
        "Count": 71
      }
    ],
+    "UnlockID": [
+      500009
+    ],
    "ParentComponentID": 3000140101,
    "VehicleID": 300014,
    "Icon": "Poster_Component_3000140102.png",
@ -537,6 +575,7 @@
        "Count": 72
      }
    ],
+    "UnlockID": [],
    "ParentComponentID": 0,
    "VehicleID": 300014,
    "Icon": "Poster_Component_3000140201.png",
@ -561,6 +600,7 @@
        "Count": 73
      }
    ],
+    "UnlockID": [],
    "ParentComponentID": 0,
    "VehicleID": 300014,
    "Icon": "Poster_Component_3000140301.png",
@ -585,6 +625,9 @@
        "Count": 74
      }
    ],
+    "UnlockID": [
+      500010
+    ],
    "ParentComponentID": 3000140301,
    "VehicleID": 300014,
    "Icon": "Poster_Component_3000140302.png",
--- a/ProjectNLD/Assets/Config/Data/viheclecultivatecfg_vehiclepaint.json
+++ b/ProjectNLD/Assets/Config/Data/viheclecultivatecfg_vehiclepaint.json
@ -12,12 +12,8 @@
    "CriticalRate": 0,
    "CriticalScale": 0,
    "UnlockType": 4,
-    "PaintCost": [
-      {
-        "Id": 21,
-        "Count": 1
-      }
-    ]
+    "ItemID": 21,
+    "PaintCost": []
  },
  {
    "PaintID": 2000,
@ -32,12 +28,8 @@
    "CriticalRate": 0,
    "CriticalScale": 0,
    "UnlockType": 4,
-    "PaintCost": [
-      {
-        "Id": 22,
-        "Count": 1
-      }
-    ]
+    "ItemID": 22,
+    "PaintCost": []
  },
  {
    "PaintID": 3000,
@ -52,12 +44,8 @@
    "CriticalRate": 0,
    "CriticalScale": 0,
    "UnlockType": 4,
-    "PaintCost": [
-      {
-        "Id": 23,
-        "Count": 1
-      }
-    ]
+    "ItemID": 23,
+    "PaintCost": []
  },
  {
    "PaintID": 1001,
@ -72,12 +60,8 @@
    "CriticalRate": 0,
    "CriticalScale": 11,
    "UnlockType": 4,
-    "PaintCost": [
-      {
-        "Id": 24,
-        "Count": 1
-      }
-    ]
+    "ItemID": 24,
+    "PaintCost": []
  },
  {
    "PaintID": 2001,
@ -92,12 +76,8 @@
    "CriticalRate": 0,
    "CriticalScale": 0,
    "UnlockType": 4,
-    "PaintCost": [
-      {
-        "Id": 25,
-        "Count": 1
-      }
-    ]
+    "ItemID": 25,
+    "PaintCost": []
  },
  {
    "PaintID": 3001,
@ -112,12 +92,8 @@
    "CriticalRate": 0,
    "CriticalScale": 5,
    "UnlockType": 4,
-    "PaintCost": [
-      {
-        "Id": 26,
-        "Count": 1
-      }
-    ]
+    "ItemID": 26,
+    "PaintCost": []
  },
  {
    "PaintID": 1002,
@ -132,6 +108,7 @@
    "CriticalRate": 0,
    "CriticalScale": 0,
    "UnlockType": 2,
+    "ItemID": 27,
    "PaintCost": [
      {
        "Id": 9,
@ -152,6 +129,7 @@
    "CriticalRate": 0,
    "CriticalScale": 0,
    "UnlockType": 2,
+    "ItemID": 28,
    "PaintCost": [
      {
        "Id": 9,
@ -172,6 +150,7 @@
    "CriticalRate": 0,
    "CriticalScale": 0,
    "UnlockType": 2,
+    "ItemID": 29,
    "PaintCost": [
      {
        "Id": 9,
@ -192,6 +171,7 @@
    "CriticalRate": 0,
    "CriticalScale": 13,
    "UnlockType": 3,
+    "ItemID": 30,
    "PaintCost": [
      {
        "Id": 1000,
@ -212,6 +192,7 @@
    "CriticalRate": 0,
    "CriticalScale": 0,
    "UnlockType": 3,
+    "ItemID": 31,
    "PaintCost": [
      {
        "Id": 1000,
@ -232,6 +213,7 @@
    "CriticalRate": 0,
    "CriticalScale": 4,
    "UnlockType": 3,
+    "ItemID": 32,
    "PaintCost": [
      {
        "Id": 1000,
@ -252,6 +234,7 @@
    "CriticalRate": 0,
    "CriticalScale": 0,
    "UnlockType": 1,
+    "ItemID": 33,
    "PaintCost": [
      {
        "Id": 2,
@ -272,6 +255,7 @@
    "CriticalRate": 0,
    "CriticalScale": 0,
    "UnlockType": 1,
+    "ItemID": 34,
    "PaintCost": [
      {
        "Id": 2,
@ -292,6 +276,7 @@
    "CriticalRate": 0,
    "CriticalScale": 0,
    "UnlockType": 1,
+    "ItemID": 35,
    "PaintCost": [
      {
        "Id": 2,
@ -312,6 +297,7 @@
    "CriticalRate": 0,
    "CriticalScale": 20,
    "UnlockType": 1,
+    "ItemID": 36,
    "PaintCost": [
      {
        "Id": 2,
@ -332,6 +318,7 @@
    "CriticalRate": 0,
    "CriticalScale": 0,
    "UnlockType": 1,
+    "ItemID": 37,
    "PaintCost": [
      {
        "Id": 2,
@ -352,6 +339,7 @@
    "CriticalRate": 0,
    "CriticalScale": 7,
    "UnlockType": 1,
+    "ItemID": 38,
    "PaintCost": [
      {
        "Id": 2,
@ -372,6 +360,7 @@
    "CriticalRate": 0,
    "CriticalScale": 0,
    "UnlockType": 1,
+    "ItemID": 39,
    "PaintCost": [
      {
        "Id": 2,
@ -392,6 +381,7 @@
    "CriticalRate": 0,
    "CriticalScale": 0,
    "UnlockType": 1,
+    "ItemID": 40,
    "PaintCost": [
      {
        "Id": 2,
@ -412,6 +402,7 @@
    "CriticalRate": 0,
    "CriticalScale": 0,
    "UnlockType": 1,
+    "ItemID": 41,
    "PaintCost": [
      {
        "Id": 2,
--- a/ProjectNLD/Assets/Config/Data/weaponcfg_weaponconfig.json
+++ b/ProjectNLD/Assets/Config/Data/weaponcfg_weaponconfig.json
@ -63,7 +63,7 @@
    "SettleCapAnimPath": "ani_g03_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 120,
+    "BulletFlySpeed": 60,
    "FireAudioId": [
      "Sound_Shoot_4"
    ],
@ -102,7 +102,7 @@
    "SettleCapAnimPath": "ani_g03_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 120,
+    "BulletFlySpeed": 60,
    "FireAudioId": [
      "Sound_Shoot_5"
    ],
@ -141,7 +141,7 @@
    "SettleCapAnimPath": "ani_g04_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_3_1",
      "Sound_Shoot_3_2"
@ -181,7 +181,7 @@
    "SettleCapAnimPath": "ani_g02_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_14"
    ],
@ -220,7 +220,7 @@
    "SettleCapAnimPath": "ani_g01_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 150,
+    "BulletFlySpeed": 75,
    "FireAudioId": [
      "Sound_Shoot_8"
    ],
@ -259,7 +259,7 @@
    "SettleCapAnimPath": "ani_g05_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 120,
+    "BulletFlySpeed": 60,
    "FireAudioId": [
      "Sound_Shoot_4"
    ],
@ -298,7 +298,7 @@
    "SettleCapAnimPath": "ani_g03_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 120,
+    "BulletFlySpeed": 60,
    "FireAudioId": [
      "Sound_Shoot_8"
    ],
@ -337,7 +337,7 @@
    "SettleCapAnimPath": "ani_g08_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_15"
    ],
@ -376,7 +376,7 @@
    "SettleCapAnimPath": "ani_g03_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 120,
+    "BulletFlySpeed": 60,
    "FireAudioId": [
      "Sound_Shoot_12"
    ],
@ -415,7 +415,7 @@
    "SettleCapAnimPath": "ani_g03_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 120,
+    "BulletFlySpeed": 60,
    "FireAudioId": [
      "Sound_Shoot_12"
    ],
@ -449,12 +449,12 @@
    "AllowShootAtNoFullReload": false,
    "AttackDistance": 6,
    "AttackIgoreBlock": false,
-    "ModelPath": "P_G00011",
+    "ModelPath": "P_G00011_01",
    "SettleTeamAnimPath": "ani_g11_s_victory001",
    "SettleCapAnimPath": "ani_g11_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [],
    "ParentPointName": "Grip_point01",
    "FireGroundEffect": true,
@ -491,7 +491,7 @@
    "SettleCapAnimPath": "ani_g01_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 120,
+    "BulletFlySpeed": 60,
    "FireAudioId": [
      "Sound_Shoot_15"
    ],
@ -530,7 +530,7 @@
    "SettleCapAnimPath": "ani_g06_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 120,
+    "BulletFlySpeed": 60,
    "FireAudioId": [
      "Sound_Shoot_12"
    ],
@ -569,7 +569,7 @@
    "SettleCapAnimPath": "ani_g02_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 150,
+    "BulletFlySpeed": 75,
    "FireAudioId": [
      "Sound_Shoot_10"
    ],
@ -608,7 +608,7 @@
    "SettleCapAnimPath": "ani_g01_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 150,
+    "BulletFlySpeed": 75,
    "FireAudioId": [
      "Sound_Shoot_8"
    ],
@ -647,7 +647,7 @@
    "SettleCapAnimPath": "ani_g03_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 120,
+    "BulletFlySpeed": 60,
    "FireAudioId": [
      "Sound_Shoot_12"
    ],
@ -686,7 +686,7 @@
    "SettleCapAnimPath": "ani_g01_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 120,
+    "BulletFlySpeed": 60,
    "FireAudioId": [
      "Sound_Shoot_6"
    ],
@ -725,7 +725,7 @@
    "SettleCapAnimPath": "ani_g05_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 120,
+    "BulletFlySpeed": 60,
    "FireAudioId": [
      "Sound_Shoot_4"
    ],
@ -764,7 +764,7 @@
    "SettleCapAnimPath": "ani_g03_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 150,
+    "BulletFlySpeed": 75,
    "FireAudioId": [
      "Sound_Shoot_12"
    ],
@ -803,7 +803,7 @@
    "SettleCapAnimPath": "ani_g05_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 120,
+    "BulletFlySpeed": 60,
    "FireAudioId": [
      "Sound_Shoot_4"
    ],
@ -842,7 +842,7 @@
    "SettleCapAnimPath": "ani_g01_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 120,
+    "BulletFlySpeed": 60,
    "FireAudioId": [
      "Sound_Shoot_18"
    ],
@ -876,12 +876,12 @@
    "AllowShootAtNoFullReload": false,
    "AttackDistance": 8,
    "AttackIgoreBlock": false,
-    "ModelPath": "P_G00022",
+    "ModelPath": "P_G00022_01",
    "SettleTeamAnimPath": "ani_g02_s_victory001",
    "SettleCapAnimPath": "ani_g02_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 150,
+    "BulletFlySpeed": 75,
    "FireAudioId": [
      "Sound_Shoot_11"
    ],
@ -920,7 +920,7 @@
    "SettleCapAnimPath": "ani_g05_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 120,
+    "BulletFlySpeed": 60,
    "FireAudioId": [],
    "ParentPointName": "Grip_point01",
    "FireGroundEffect": true,
@ -957,7 +957,7 @@
    "SettleCapAnimPath": "ani_g03_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 120,
+    "BulletFlySpeed": 60,
    "FireAudioId": [
      "Sound_Shoot_12"
    ],
@ -996,7 +996,7 @@
    "SettleCapAnimPath": "ani_g01_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 120,
+    "BulletFlySpeed": 60,
    "FireAudioId": [
      "Sound_Shoot_8"
    ],
@ -1035,7 +1035,7 @@
    "SettleCapAnimPath": "ani_g03_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 120,
+    "BulletFlySpeed": 60,
    "FireAudioId": [
      "Sound_Shoot_6"
    ],
@ -1074,7 +1074,7 @@
    "SettleCapAnimPath": "ani_g08_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_15"
    ],
@ -1113,7 +1113,7 @@
    "SettleCapAnimPath": "ani_g08_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_19"
    ],
@ -1152,7 +1152,7 @@
    "SettleCapAnimPath": "ani_g01_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_7"
    ],
@ -1191,7 +1191,7 @@
    "SettleCapAnimPath": "ani_g01_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_6"
    ],
@ -1230,7 +1230,7 @@
    "SettleCapAnimPath": "ani_g03_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_11"
    ],
@ -1269,7 +1269,7 @@
    "SettleCapAnimPath": "ani_g05_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_4"
    ],
@ -1308,7 +1308,7 @@
    "SettleCapAnimPath": "ani_g01_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_9"
    ],
@ -1347,7 +1347,7 @@
    "SettleCapAnimPath": "ani_g01_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_11"
    ],
@ -1386,7 +1386,7 @@
    "SettleCapAnimPath": "ani_g05_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_4"
    ],
@ -1425,7 +1425,7 @@
    "SettleCapAnimPath": "ani_g03_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_11"
    ],
@ -1464,7 +1464,7 @@
    "SettleCapAnimPath": "ani_g01_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_6"
    ],
@ -1503,7 +1503,7 @@
    "SettleCapAnimPath": "ani_g01_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_7"
    ],
@ -1542,7 +1542,7 @@
    "SettleCapAnimPath": "ani_g03_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_12"
    ],
@ -1581,7 +1581,7 @@
    "SettleCapAnimPath": "ani_g03_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_20"
    ],
@ -1620,7 +1620,7 @@
    "SettleCapAnimPath": "ani_g08_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_17"
    ],
@ -1659,7 +1659,7 @@
    "SettleCapAnimPath": "ani_g03_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_12"
    ],
@ -1698,7 +1698,7 @@
    "SettleCapAnimPath": "ani_g02_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_13"
    ],
@ -1737,7 +1737,7 @@
    "SettleCapAnimPath": "ani_g08_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_12"
    ],
@ -1776,7 +1776,7 @@
    "SettleCapAnimPath": "ani_g03_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_20"
    ],
@ -1815,7 +1815,7 @@
    "SettleCapAnimPath": "ani_g02_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_13"
    ],
@ -1854,7 +1854,7 @@
    "SettleCapAnimPath": "ani_g02_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_13"
    ],
@ -1893,7 +1893,7 @@
    "SettleCapAnimPath": "ani_g03_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_12"
    ],
@ -1932,7 +1932,7 @@
    "SettleCapAnimPath": "ani_g05_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_5"
    ],
@ -1971,7 +1971,7 @@
    "SettleCapAnimPath": "ani_g02_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_18"
    ],
@ -2010,7 +2010,7 @@
    "SettleCapAnimPath": "ani_g03_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_12"
    ],
@ -2049,7 +2049,7 @@
    "SettleCapAnimPath": "ani_g03_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_11"
    ],
@ -2088,7 +2088,7 @@
    "SettleCapAnimPath": "ani_g02_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_18"
    ],
@ -2127,7 +2127,7 @@
    "SettleCapAnimPath": "ani_g03_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_11"
    ],
@ -2166,7 +2166,7 @@
    "SettleCapAnimPath": "ani_g02_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_13"
    ],
@ -2205,7 +2205,7 @@
    "SettleCapAnimPath": "ani_g01_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_7"
    ],
@ -2244,7 +2244,7 @@
    "SettleCapAnimPath": "ani_g08_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_9"
    ],
@ -2283,7 +2283,7 @@
    "SettleCapAnimPath": "ani_g02_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_20"
    ],
@ -2322,7 +2322,7 @@
    "SettleCapAnimPath": "ani_g02_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_18"
    ],
@ -2361,7 +2361,7 @@
    "SettleCapAnimPath": "ani_g08_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_8"
    ],
@ -2400,7 +2400,7 @@
    "SettleCapAnimPath": "ani_g03_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_18"
    ],
@ -2439,7 +2439,7 @@
    "SettleCapAnimPath": "ani_g03_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_11"
    ],
@ -2478,7 +2478,7 @@
    "SettleCapAnimPath": "ani_g01_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_2"
    ],
@ -2517,7 +2517,7 @@
    "SettleCapAnimPath": "ani_g02_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_13"
    ],
@ -2556,7 +2556,7 @@
    "SettleCapAnimPath": "ani_g08_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_18"
    ],
@ -2595,7 +2595,7 @@
    "SettleCapAnimPath": "ani_g01_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_9"
    ],
@ -2634,7 +2634,7 @@
    "SettleCapAnimPath": "ani_g01_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_6"
    ],
@ -2673,7 +2673,7 @@
    "SettleCapAnimPath": "ani_g01_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_9"
    ],
@ -2712,7 +2712,7 @@
    "SettleCapAnimPath": "ani_g01_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_2"
    ],
@ -2751,7 +2751,7 @@
    "SettleCapAnimPath": "ani_g03_s_victory002",
    "FireAnimName": "",
    "ReleadAnimName": "",
-    "BulletFlySpeed": 100,
+    "BulletFlySpeed": 50,
    "FireAudioId": [
      "Sound_Shoot_17"
    ],