修改bug

Assets/Res/Config/DropConfig.json

@@ -0,0 +1,22 @@
+{
+  "configList": [
+    {
+      "ID": 10001,
+      "dropGroupID": [
+        10001
+      ]
+    },
+    {
+      "ID": 10002,
+      "dropGroupID": [
+        10002
+      ]
+    },
+    {
+      "ID": 10003,
+      "dropGroupID": [
+        10003
+      ]
+    }
+  ]
+}

Assets/Res/Config/DropConfig.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XS5NtSOqUCrVF8Pwakc7AieTArDKnjPABNp+LJnkiJUNxq+8cqnlql8=
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Config/DropCountConfig.json

@@ -0,0 +1,184 @@
+{
+  "configList": [
+    {
+      "ID": 1,
+      "groupID": 1,
+      "proportion": 10,
+      "weight": 2
+    },
+    {
+      "ID": 2,
+      "groupID": 1,
+      "proportion": 20,
+      "weight": 4
+    },
+    {
+      "ID": 3,
+      "groupID": 1,
+      "proportion": 30,
+      "weight": 8
+    },
+    {
+      "ID": 4,
+      "groupID": 1,
+      "proportion": 40,
+      "weight": 16
+    },
+    {
+      "ID": 5,
+      "groupID": 1,
+      "proportion": 50,
+      "weight": 32
+    },
+    {
+      "ID": 6,
+      "groupID": 1,
+      "proportion": 60,
+      "weight": 16
+    },
+    {
+      "ID": 7,
+      "groupID": 1,
+      "proportion": 70,
+      "weight": 8
+    },
+    {
+      "ID": 8,
+      "groupID": 1,
+      "proportion": 80,
+      "weight": 4
+    },
+    {
+      "ID": 9,
+      "groupID": 1,
+      "proportion": 90,
+      "weight": 2
+    },
+    {
+      "ID": 10,
+      "groupID": 1,
+      "proportion": 100,
+      "weight": 1
+    },
+    {
+      "ID": 11,
+      "groupID": 2,
+      "proportion": 10,
+      "weight": 1
+    },
+    {
+      "ID": 12,
+      "groupID": 2,
+      "proportion": 20,
+      "weight": 2
+    },
+    {
+      "ID": 13,
+      "groupID": 2,
+      "proportion": 30,
+      "weight": 3
+    },
+    {
+      "ID": 14,
+      "groupID": 2,
+      "proportion": 40,
+      "weight": 5
+    },
+    {
+      "ID": 15,
+      "groupID": 2,
+      "proportion": 50,
+      "weight": 7
+    },
+    {
+      "ID": 16,
+      "groupID": 2,
+      "proportion": 60,
+      "weight": 9
+    },
+    {
+      "ID": 17,
+      "groupID": 2,
+      "proportion": 70,
+      "weight": 15
+    },
+    {
+      "ID": 18,
+      "groupID": 2,
+      "proportion": 80,
+      "weight": 16
+    },
+    {
+      "ID": 19,
+      "groupID": 2,
+      "proportion": 90,
+      "weight": 18
+    },
+    {
+      "ID": 20,
+      "groupID": 2,
+      "proportion": 100,
+      "weight": 20
+    },
+    {
+      "ID": 21,
+      "groupID": 3,
+      "proportion": 10,
+      "weight": 1024
+    },
+    {
+      "ID": 22,
+      "groupID": 3,
+      "proportion": 20,
+      "weight": 256
+    },
+    {
+      "ID": 23,
+      "groupID": 3,
+      "proportion": 30,
+      "weight": 128
+    },
+    {
+      "ID": 24,
+      "groupID": 3,
+      "proportion": 40,
+      "weight": 64
+    },
+    {
+      "ID": 25,
+      "groupID": 3,
+      "proportion": 50,
+      "weight": 32
+    },
+    {
+      "ID": 26,
+      "groupID": 3,
+      "proportion": 60,
+      "weight": 16
+    },
+    {
+      "ID": 27,
+      "groupID": 3,
+      "proportion": 70,
+      "weight": 8
+    },
+    {
+      "ID": 28,
+      "groupID": 3,
+      "proportion": 80,
+      "weight": 4
+    },
+    {
+      "ID": 29,
+      "groupID": 3,
+      "proportion": 90,
+      "weight": 2
+    },
+    {
+      "ID": 30,
+      "groupID": 3,
+      "proportion": 100,
+      "weight": 1
+    }
+  ]
+}

Assets/Res/Config/DropCountConfig.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Xn0b5y2uAnhXg7g5u3YeJfvU7b9uiVF7jxzflUHtuOGvDg/VHRQRYNU=
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Config/DropGroupConfig.json

@@ -0,0 +1,22 @@
+{
+  "configList": [
+    {
+      "ID": 10001,
+      "dropItemID": [
+        10001
+      ]
+    },
+    {
+      "ID": 10002,
+      "dropItemID": [
+        10002
+      ]
+    },
+    {
+      "ID": 10003,
+      "dropItemID": [
+        10003
+      ]
+    }
+  ]
+}

Assets/Res/Config/DropGroupConfig.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DH5LsnutUSllxB6z3EWic/izfq1OyGVjeWNV5Z8F4KI4GkZ6Jpj8ILI=
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Config/DropItemConfig.json

@@ -0,0 +1,31 @@
+{
+  "configList": [
+    {
+      "ID": 10001,
+      "itemID": [
+        20001
+      ],
+      "dropMinV": 1,
+      "dropMaxV": 1,
+      "dropCountGoupID": -1
+    },
+    {
+      "ID": 10002,
+      "itemID": [
+        20002
+      ],
+      "dropMinV": 1,
+      "dropMaxV": 1,
+      "dropCountGoupID": -1
+    },
+    {
+      "ID": 10003,
+      "itemID": [
+        20003
+      ],
+      "dropMinV": 1,
+      "dropMaxV": 1,
+      "dropCountGoupID": -1
+    }
+  ]
+}

Assets/Res/Config/DropItemConfig.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CSgdsi77BX4hfFOnpI+I2Z79KPWX1kKwPmBTxdYsn1uqoLTfWlJYnvA=
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Config/HeroModelConfig.json

@@ -1,102 +1,5 @@
 {
   "configList": [
-    {
-      "ID": 101,
-      "nickName": -1,
-      "name": 1,
-      "headicon": "icon_tx101",
-      "model": "",
-      "isUseGpu": false,
-      "starGrade": 3,
-      "rarity": 2,
-      "heroType": 1,
-      "profession": 1,
-      "hp": 100,
-      "def": 2,
-      "crit": null,
-      "attack": 10,
-      "shanbi": 10,
-      "expGain": 100,
-      "move_speed": 8,
-      "speed_atk": 1.0,
-      "range_atk": 2,
-      "skillID": [
-        70011
-      ],
-      "heroStory": 70091
-    },
-    {
-      "ID": 102,
-      "nickName": -1,
-      "name": 2,
-      "headicon": "icon_tx102",
-      "model": "",
-      "isUseGpu": false,
-      "starGrade": 3,
-      "rarity": 2,
-      "heroType": 1,
-      "profession": 1,
-      "hp": 100,
-      "def": 3,
-      "crit": null,
-      "attack": 11,
-      "shanbi": 10,
-      "expGain": 100,
-      "move_speed": 8,
-      "speed_atk": 1.0,
-      "range_atk": 3,
-      "skillID": [
-        70012
-      ],
-      "heroStory": 70092
-    },
-    {
-      "ID": 103,
-      "nickName": -1,
-      "name": 3,
-      "headicon": "icon_tx103",
-      "model": "",
-      "isUseGpu": false,
-      "starGrade": 3,
-      "rarity": 1,
-      "heroType": 1,
-      "profession": 1,
-      "hp": 100,
-      "def": 4,
-      "crit": null,
-      "attack": 12,
-      "shanbi": 10,
-      "expGain": 100,
-      "move_speed": 8,
-      "speed_atk": 1.0,
-      "range_atk": 4,
-      "skillID": [
-        70013
-      ],
-      "heroStory": 70093
-    },
-    {
-      "ID": 104,
-      "nickName": -1,
-      "name": 4,
-      "headicon": "icon_tx104",
-      "model": "",
-      "isUseGpu": false,
-      "starGrade": 3,
-      "rarity": 1,
-      "heroType": 1,
-      "profession": 1,
-      "hp": 100,
-      "def": 2,
-      "crit": null,
-      "attack": 10,
-      "shanbi": 10,
-      "expGain": 100,
-      "move_speed": 8,
-      "speed_atk": 1.0,
-      "range_atk": 2,
-      "heroStory": null
-    },
     {
       "ID": 105,
       "nickName": -1,
@@ -117,28 +20,10 @@
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 3,
-      "heroStory": null
-    },
-    {
-      "ID": 106,
-      "nickName": -1,
-      "name": 6,
-      "headicon": "icon_tx106",
-      "model": "",
-      "isUseGpu": false,
-      "starGrade": 3,
-      "rarity": 2,
-      "heroType": 1,
-      "profession": 2,
-      "hp": 100,
-      "def": 4,
-      "crit": null,
-      "attack": 12,
-      "shanbi": 10,
-      "expGain": 100,
-      "move_speed": 8,
-      "speed_atk": 1.0,
-      "range_atk": 4,
+      "skillID": [
+        10011,
+        100011
+      ],
       "heroStory": null
     },
     {
@@ -161,116 +46,10 @@
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 2,
-      "heroStory": null
-    },
-    {
-      "ID": 108,
-      "nickName": -1,
-      "name": 8,
-      "headicon": "icon_tx108",
-      "model": "",
-      "isUseGpu": false,
-      "starGrade": 3,
-      "rarity": 2,
-      "heroType": 1,
-      "profession": 2,
-      "hp": 100,
-      "def": 3,
-      "crit": null,
-      "attack": 11,
-      "shanbi": 10,
-      "expGain": 100,
-      "move_speed": 8,
-      "speed_atk": 1.0,
-      "range_atk": 3,
-      "heroStory": null
-    },
-    {
-      "ID": 109,
-      "nickName": -1,
-      "name": 9,
-      "headicon": "icon_tx109",
-      "model": "",
-      "isUseGpu": false,
-      "starGrade": 3,
-      "rarity": 1,
-      "heroType": 1,
-      "profession": 2,
-      "hp": 100,
-      "def": 4,
-      "crit": null,
-      "attack": 12,
-      "shanbi": 10,
-      "expGain": 100,
-      "move_speed": 8,
-      "speed_atk": 1.0,
-      "range_atk": 4,
-      "heroStory": null
-    },
-    {
-      "ID": 110,
-      "nickName": -1,
-      "name": 10,
-      "headicon": "icon_tx110",
-      "model": "",
-      "isUseGpu": false,
-      "starGrade": 3,
-      "rarity": 1,
-      "heroType": 1,
-      "profession": 2,
-      "hp": 100,
-      "def": 2,
-      "crit": null,
-      "attack": 10,
-      "shanbi": 10,
-      "expGain": 100,
-      "move_speed": 8,
-      "speed_atk": 1.0,
-      "range_atk": 2,
-      "heroStory": null
-    },
-    {
-      "ID": 111,
-      "nickName": -1,
-      "name": 11,
-      "headicon": "icon_tx111",
-      "model": "",
-      "isUseGpu": false,
-      "starGrade": 3,
-      "rarity": 2,
-      "heroType": 1,
-      "profession": 3,
-      "hp": 100,
-      "def": 3,
-      "crit": null,
-      "attack": 11,
-      "shanbi": 10,
-      "expGain": 100,
-      "move_speed": 8,
-      "speed_atk": 1.0,
-      "range_atk": 3,
-      "heroStory": null
-    },
-    {
-      "ID": 112,
-      "nickName": -1,
-      "name": 12,
-      "headicon": "icon_tx112",
-      "model": "",
-      "isUseGpu": false,
-      "starGrade": 3,
-      "rarity": 2,
-      "heroType": 1,
-      "profession": 3,
-      "hp": 100,
-      "def": 4,
-      "crit": null,
-      "attack": 12,
-      "shanbi": 10,
-      "expGain": 100,
-      "move_speed": 8,
-      "speed_atk": 1.0,
-      "range_atk": 4,
+      "skillID": [
+        10011,
+        300011
+      ],
       "heroStory": null
     },
     {
@@ -293,50 +72,10 @@
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 2,
-      "heroStory": null
-    },
-    {
-      "ID": 114,
-      "nickName": -1,
-      "name": 14,
-      "headicon": "icon_tx114",
-      "model": "",
-      "isUseGpu": false,
-      "starGrade": 3,
-      "rarity": 1,
-      "heroType": 1,
-      "profession": 3,
-      "hp": 100,
-      "def": 3,
-      "crit": null,
-      "attack": 11,
-      "shanbi": 10,
-      "expGain": 100,
-      "move_speed": 8,
-      "speed_atk": 1.0,
-      "range_atk": 3,
-      "heroStory": null
-    },
-    {
-      "ID": 115,
-      "nickName": -1,
-      "name": 15,
-      "headicon": "icon_tx115",
-      "model": "",
-      "isUseGpu": false,
-      "starGrade": 3,
-      "rarity": 1,
-      "heroType": 1,
-      "profession": 3,
-      "hp": 100,
-      "def": 4,
-      "crit": null,
-      "attack": 12,
-      "shanbi": 10,
-      "expGain": 100,
-      "move_speed": 8,
-      "speed_atk": 1.0,
-      "range_atk": 4,
+      "skillID": [
+        10011,
+        200011
+      ],
       "heroStory": null
     },
     {
@@ -359,94 +98,10 @@
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 2,
-      "heroStory": null
-    },
-    {
-      "ID": 117,
-      "nickName": -1,
-      "name": 17,
-      "headicon": "icon_tx117",
-      "model": "",
-      "isUseGpu": false,
-      "starGrade": 3,
-      "rarity": 2,
-      "heroType": 1,
-      "profession": 4,
-      "hp": 100,
-      "def": 3,
-      "crit": null,
-      "attack": 11,
-      "shanbi": 10,
-      "expGain": 100,
-      "move_speed": 8,
-      "speed_atk": 1.0,
-      "range_atk": 3,
-      "heroStory": null
-    },
-    {
-      "ID": 118,
-      "nickName": -1,
-      "name": 18,
-      "headicon": "icon_tx118",
-      "model": "",
-      "isUseGpu": false,
-      "starGrade": 3,
-      "rarity": 2,
-      "heroType": 1,
-      "profession": 4,
-      "hp": 100,
-      "def": 4,
-      "crit": null,
-      "attack": 12,
-      "shanbi": 10,
-      "expGain": 100,
-      "move_speed": 8,
-      "speed_atk": 1.0,
-      "range_atk": 4,
-      "heroStory": null
-    },
-    {
-      "ID": 119,
-      "nickName": -1,
-      "name": 19,
-      "headicon": "icon_tx119",
-      "model": "",
-      "isUseGpu": false,
-      "starGrade": 3,
-      "rarity": 1,
-      "heroType": 1,
-      "profession": 4,
-      "hp": 100,
-      "def": 3,
-      "crit": null,
-      "attack": 11,
-      "shanbi": 10,
-      "expGain": 100,
-      "move_speed": 8,
-      "speed_atk": 1.0,
-      "range_atk": 3,
-      "heroStory": null
-    },
-    {
-      "ID": 120,
-      "nickName": -1,
-      "name": 20,
-      "headicon": "icon_tx120",
-      "model": "",
-      "isUseGpu": false,
-      "starGrade": 3,
-      "rarity": 1,
-      "heroType": 1,
-      "profession": 4,
-      "hp": 100,
-      "def": 4,
-      "crit": null,
-      "attack": 12,
-      "shanbi": 10,
-      "expGain": 100,
-      "move_speed": 8,
-      "speed_atk": 1.0,
-      "range_atk": 4,
+      "skillID": [
+        10011,
+        400011
+      ],
       "heroStory": null
     },
     {

Assets/Scripts/GameData/ExcelConfig/DropConfig.cs

@@ -0,0 +1,39 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\ChouKa.xlsx. SheetName: DropConfig
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "DropConfig.json")]
+	public partial class DropConfigHolder : ConfigHolder<DropConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct DropConfig : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///掉落ID
+		/// </summary>
+public int ID;
+
+
+		/// <summary>
+		///掉落组ID
+		/// </summary>
+public int[] dropGroupID;
+
+
+
+		/// <summary>
+		///显示ID -99:通过工厂表决定显示
+		/// </summary>
+public int[] showItemId;
+
+
+	}
+
+}
+// End of Auto Generated Code

Assets/Scripts/GameData/ExcelConfig/DropConfig.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: Xi9LvC2vVC34Cmfo/f+z84R16Bx65KHI6Qw9QPjfU/Cs/upWVd3xLGc=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameData/ExcelConfig/DropCountConfig.cs

@@ -0,0 +1,44 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\ChouKa.xlsx. SheetName: DropCountConfig
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "DropCountConfig.json")]
+	public partial class DropCountConfigHolder : ConfigHolder<DropCountConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct DropCountConfig : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///
+		/// </summary>
+public int ID;
+
+
+		/// <summary>
+		///
+		/// </summary>
+public int groupID;
+
+
+		/// <summary>
+		///最高比例
+		/// </summary>
+public int proportion;
+
+
+		/// <summary>
+		///权重
+		/// </summary>
+public int weight;
+
+
+	}
+
+}
+// End of Auto Generated Code

Assets/Scripts/GameData/ExcelConfig/DropCountConfig.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: DSkdtCmqAXlB66SONCx2X4BHERnySAyzhFiDoi96i2WLJtY5tFL3wBI=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameData/ExcelConfig/DropGroupConfig.cs

@@ -0,0 +1,33 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\ChouKa.xlsx. SheetName: DropGroupConfig
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "DropGroupConfig.json")]
+	public partial class DropGroupConfigHolder : ConfigHolder<DropGroupConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct DropGroupConfig : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///掉落组ID
+		/// </summary>
+public int ID;
+
+
+
+		/// <summary>
+		///
+		/// </summary>
+public int[] dropItemID;
+
+
+	}
+
+}
+// End of Auto Generated Code

Assets/Scripts/GameData/ExcelConfig/DropGroupConfig.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: DCge5H+lUXsgfUr+RrClj+nTs3ieux22dJwlXkA7P/PWlRP+6S/75Z4=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameData/ExcelConfig/DropItemConfig.cs

@@ -0,0 +1,51 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\ChouKa.xlsx. SheetName: DropItemConfig
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "DropItemConfig.json")]
+	public partial class DropItemConfigHolder : ConfigHolder<DropItemConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct DropItemConfig : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///ID号
+		/// </summary>
+public int ID;
+
+
+
+		/// <summary>
+		///道具ID
+		/// </summary>
+public int[] itemID;
+
+
+		/// <summary>
+		///掉落最小数量
+		/// </summary>
+public int dropMinV;
+
+
+		/// <summary>
+		///掉落最大数量
+		/// </summary>
+public int dropMaxV;
+
+
+		/// <summary>
+		///掉落数量使用哪种分布方式 对应DropCountConfig的GroupID 默认-1，平均分布
+		/// </summary>
+public int dropCountGoupID;
+
+
+	}
+
+}
+// End of Auto Generated Code

Assets/Scripts/GameData/ExcelConfig/DropItemConfig.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: BntNsy2rAC+cBhFVKicNa6iusEwPne+Dcz4F89XaxyrimeAUR8zSl/U=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs

@@ -197,7 +197,8 @@ namespace GameLogic.Combat.CombatType
         protected override async CTask ProStartGame()
         {
             CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer();
-            TestCombat(cTaskAwaitBuffer);
+            // TestCombat(cTaskAwaitBuffer);
+            InitPlayerHero(cTaskAwaitBuffer);
             InitTestCombatBoChi();
             CreateEnemy(cTaskAwaitBuffer);
             await cTaskAwaitBuffer.WaitAll();
@@ -338,6 +339,24 @@ namespace GameLogic.Combat.CombatType
             }
         }
 
+        private void InitPlayerHero(CTaskAwaitBuffer cTaskAwaitBuffer)
+        {
+            for (int i = 0; i < PlayerManager.Instance.heroListInLead.Count; i++)
+            {
+                int index = i;
+                CombatHeroEntity heroEntity = new CombatHeroEntity();
+                heroEntity.IsEnemy = false;
+                heroEntity.number = i;
+             
+                cTaskAwaitBuffer.AddTask(heroEntity.Init(new CombatAIBasic(), PlayerManager.Instance.heroListInLead[i],
+                    delegate(CombatHeroEntity entity)
+                    {
+                        combatController.CombatHeroController.AddHero(entity);
+                        heroEntity.combatHeroGameObject.SetPosition(_combatScenesConfig.heroPoint[index].position);
+                    }));
+            }
+        }
+
         private void TestCombat(CTaskAwaitBuffer cTaskAwaitBuffer)
         {
             testCombatHeroConfig = GameObject.FindObjectOfType<TestCombatHeroConfig>();

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroEntity.cs

@@ -170,7 +170,7 @@ public class CombatHeroEntity : ITimeLineSpecialDotPos, ILifeCycle, ITimeLineAni
     public void HeroResurrection()
     {
         isDie = false;
-        CombatAIBasic.ChangeState(CombatHeroStateType.dile);
+        CombatAIBasic.ChangeState(CombatHeroStateType.idle);
         HeroHpUpdateEventData heroHpUpdateEventData = HeroHpUpdateEventData.Create();
         heroHpUpdateEventData.combatHeroEntity = this;
         CombatEventManager.Instance.Dispatch(CombatEventType.HeroHpUpdate, heroHpUpdateEventData);

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -83,11 +83,16 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
             heroPowerId = 1,
             heroPromoteId = 3
         };
-
+        HeroData heroData4 = new HeroData
+        {
+            heroModelId = 113,
+            heroPowerId = 1,
+            heroPromoteId = 3
+        };
         playerData.HeroListInLeadDatas.Add(heroData1);
         playerData.HeroListInLeadDatas.Add(heroData2);
         playerData.HeroListInLeadDatas.Add(heroData3);
-        
+        playerData.HeroListInLeadDatas.Add(heroData4);
         SavePlayerData();
     }
     

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -34,6 +34,52 @@ public class PlayerManager : Singleton<PlayerManager>
         }
     }
 
+    public void InitTestHero()
+    {
+        heroListInLead.Clear();
+        // AccountFileInfo.Instance.LoadPlayerData();
+        
+        AccountFileInfo.HeroData heroData1 = new AccountFileInfo.HeroData
+        {
+            heroModelId = 105,
+            heroPowerId = 1,
+            heroPromoteId = 3
+        };
+        
+        AccountFileInfo.HeroData heroData2 = new AccountFileInfo.HeroData
+        {
+            heroModelId = 107,
+            heroPowerId = 1,
+            heroPromoteId = 3
+        };
+        
+        AccountFileInfo.HeroData heroData3 = new AccountFileInfo.HeroData
+        {
+            heroModelId = 116,
+            heroPowerId = 1,
+            heroPromoteId = 3
+        };
+        AccountFileInfo.HeroData heroData4 = new AccountFileInfo.HeroData
+        {
+            heroModelId = 113,
+            heroPowerId = 1,
+            heroPromoteId = 3
+        };
+        AccountFileInfo.Instance.playerData.HeroListInLeadDatas.Clear();
+        AccountFileInfo.Instance.playerData.HeroListInLeadDatas.Add(heroData1);
+        AccountFileInfo.Instance.playerData.HeroListInLeadDatas.Add(heroData2);
+        AccountFileInfo.Instance.playerData.HeroListInLeadDatas.Add(heroData3);
+        AccountFileInfo.Instance.playerData.HeroListInLeadDatas.Add(heroData4);
+        
+        for (int i = 0; i < AccountFileInfo.Instance.playerData.HeroListInLeadDatas.Count; i++)
+        {
+            AccountFileInfo.HeroData heroData = AccountFileInfo.Instance.playerData.HeroListInLeadDatas[i];
+            HeroInfo heroInfo = new HeroInfo();
+            heroInfo.InitHero(heroData);
+            heroListInLead.Add(heroInfo);
+        }
+    }
+
     public HeroInfo GetHeroInfo(int modelID)
     {
         for (int i = 0; i < heroListInLead.Count; i++)

Assets/Scripts/GameUI/GameApplction.cs

@@ -53,6 +53,7 @@ public class GameApplction : MonoBehaviour
         CustomTweenManager.Init();
 
         PlayerManager.Instance.Init();
+        PlayerManager.Instance.InitTestHero();
         //主UI加载
         MainSceneController.Instance.Init();
 

UserSettings/Layouts/default-2022.dwlt

@@ -19,7 +19,7 @@ MonoBehaviour:
     width: 2543
     height: 1333
   m_ShowMode: 4
-  m_Title: Project
+  m_Title: Inspector
   m_RootView: {fileID: 4}
   m_MinSize: {x: 875, y: 321}
   m_MaxSize: {x: 10000, y: 10000}
@@ -74,7 +74,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 50}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 33
+  controlID: 34
   draggingID: 0
 --- !u!114 &4
 MonoBehaviour:
@@ -173,7 +173,7 @@ MonoBehaviour:
   m_MinSize: {x: 500, y: 100}
   m_MaxSize: {x: 40480, y: 16192}
   vertical: 0
-  controlID: 168
+  controlID: 484
   draggingID: 0
 --- !u!114 &8
 MonoBehaviour:
@@ -199,7 +199,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 32
+  controlID: 33
   draggingID: 0
 --- !u!114 &9
 MonoBehaviour:
@@ -844,9 +844,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: -0.21685492, y: 0.7829719, z: -0.42146719, w: -0.40285784}
   m_Size:
-    m_Target: 3.331384
+    m_Target: 21.888878
     speed: 2
-    m_Value: 3.331384
+    m_Value: 22.92029
   m_Ortho:
     m_Target: 0
     speed: 2
@@ -944,9 +944,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 00030000
-      m_LastClickedID: 0
-      m_ExpandedIDs: 3643feff3446feff4246feffc4faffff709e0000
+      m_SelectedIDs: 709e0000
+      m_LastClickedID: 40560
+      m_ExpandedIDs: c4faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -1015,7 +1015,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Res/UIAtlas
+    - Assets/Scripts/GameUI
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -1023,16 +1023,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Res/UIAtlas
+  - Assets/Scripts/GameUI
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\unityProject\XY001
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 383}
-    m_SelectedIDs: 94a10000
-    m_LastClickedID: 41364
-    m_ExpandedIDs: 00000000569f0000589f00005a9f00005c9f00005e9f0000609f0000629f0000649f0000669f0000689f00006a9f00006c9f00006e9f0000709f0000729f0000749f0000769f000060a1000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 406}
+    m_SelectedIDs: 749f0000
+    m_LastClickedID: 40820
+    m_ExpandedIDs: 00000000569f0000589f00005a9f00005c9f00005e9f0000609f0000629f0000649f0000669f0000689f00006a9f00006c9f00006e9f0000709f0000729f0000749f0000769f000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: