Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks

meng_yao/Assets/Config/MengYao_Skill_Date.txt

@@ -366,7 +366,7 @@
         },
         "S_2": {
             "1": {
-                "numberOfBullets": 0.25,
+                "numberOfBullets": 2,
                 "SkillList": [
                     "0"
                 ]

meng_yao/Assets/Scenes/New/Scene_map_1.unity

@@ -4372,6 +4372,7 @@ GameObject:
   - component: {fileID: 1337722729}
   - component: {fileID: 1337722730}
   - component: {fileID: 1337722731}
+  - component: {fileID: 1337722732}
   m_Layer: 0
   m_Name: ReadJson
   m_TagString: Untagged
@@ -4427,6 +4428,20 @@ MonoBehaviour:
   description: 
   MapLevelJson: {fileID: 4900000, guid: b534002cbb7fddf4bb68f34fb1357ff3, type: 3}
   count: 0
+--- !u!114 &1337722732
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1337722728}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 39d4d2c40e6ce1e45bb8069dc25b05e8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  description: 
+  _Json: {fileID: 4900000, guid: 580cfe3a34ab71847870fa8a367f7e93, type: 3}
 --- !u!1 &1342038372
 GameObject:
   m_ObjectHideFlags: 0
@@ -5898,6 +5913,8 @@ MonoBehaviour:
   SpawnLocations:
   - {fileID: 734893407}
   enemysList: []
+  MengYaoList: []
+  SortList: []
 --- !u!1 &1910338484
 GameObject:
   m_ObjectHideFlags: 0

meng_yao/Assets/script/A_Fight/SkillUp/SkillUp.cs

@@ -92,14 +92,14 @@ public class SkillUp : Fun
 
     private void Awake()
     {
-        //description = "更新后的萌耀，：使用方法xxxxxxxx";
+        description = "更新后的萌妖，：使用方法xxxxxxxx";
     }
 
     public void Up(string mengyao_id,string skill_id,string level)
     {
 
-        Debug.LogError(GlobalObj.GetComponent<Mengyao_Skill_Date>().parsedData.Count);
-        SkillLevelData info = GlobalObj.GetComponent<Mengyao_Skill_Date>().parsedData[mengyao_id][skill_id][level];
+       
+        SkillLevelData info = Mengyao_Skill_Date.instance.parsedData[mengyao_id][skill_id][level];
         //攻击范围加成
         AttackRange += info.Range;
         Debug.Log("攻击范围+"+ info.Range +"||"+ attackRange.ToString()+"=================================");

meng_yao/Assets/script/A_Fight/json/Mengyao_Skill_Date.cs

@@ -6,19 +6,23 @@ using UnityEngine;
 
 public class Mengyao_Skill_Date : JsonReadBase
 {
+    public static Mengyao_Skill_Date instance;
     public TextAsset _Json;
     public Dictionary<string, Dictionary<string, Dictionary<string, SkillLevelData>>> parsedData;
     void Awake()
     {
-       
+        instance = this;
+
+
         // 解析 JSON 数据
-        //parsedData = JsonConvert.DeserializeObject<Dictionary<string, Dictionary<string, Dictionary<string, SkillLevelData>>>>(_Json.text.Trim());
+        parsedData = JsonConvert.DeserializeObject<Dictionary<string, Dictionary<string, Dictionary<string, SkillLevelData>>>>(_Json.text.Trim());
+        Debug.LogError("解析 JSON 数据成功");
     }
 
     void Start()
     {
         // 解析 JSON 数据
-        parsedData = JsonConvert.DeserializeObject<Dictionary<string, Dictionary<string, Dictionary<string, SkillLevelData>>>>(_Json.text.Trim());
+        //parsedData = JsonConvert.DeserializeObject<Dictionary<string, Dictionary<string, Dictionary<string, SkillLevelData>>>>(_Json.text.Trim());
     }
 }
 
@@ -32,7 +36,7 @@ public class SkillLevelData
     public float AttackCooldown = 0; //攻击冷却
     public float AttackContinues = 0; //攻击持续
     public int numberOfBullets = 0;//攻击子弹数量加成
-    public int speedOfBullets = 0;//攻击子弹速度加成
+    public float speedOfBullets = 0;//攻击子弹速度加成
 
     public float CriticalRate = 0;//暴击率倍率加成
     public float CriticalDamage = 0;//暴击伤害倍率加成