Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

# Conflicts:
#	Excel2Json/Excel/修仙游戏数据规划表.xlsx   resolved by origin/master(远端) version

Assets/Res/Config/HeroModelConfig.json

@@ -8,8 +8,8 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 1,
-      "hp": 100,
       "attack": 100,
+      "hp": 100,
       "def": 50,
       "shield": 100,
       "speed_atk": 6.0,
@@ -66,10 +66,10 @@
       "model": "Guixiu01",
       "isUseGpu": false,
       "heroType": 2,
-      "hp": 100,
-      "attack": 100,
+      "attack": 85,
+      "hp": 89,
       "def": 50,
-      "shield": 100,
+      "shield": 72,
       "speed_atk": 6.0,
       "Linggen": [
         100,
@@ -124,10 +124,10 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 2,
-      "hp": 100,
-      "attack": 100,
-      "def": 50,
-      "shield": 100,
+      "attack": 75,
+      "hp": 81,
+      "def": 65,
+      "shield": 51,
       "speed_atk": 6.0,
       "Linggen": [
         100,
@@ -182,10 +182,10 @@
       "model": "Guixiu01",
       "isUseGpu": false,
       "heroType": 2,
-      "hp": 100,
-      "attack": 100,
+      "attack": 95,
+      "hp": 80,
       "def": 50,
-      "shield": 100,
+      "shield": 63,
       "speed_atk": 6.0,
       "Linggen": [
         100,
@@ -240,10 +240,10 @@
       "model": "Boss01",
       "isUseGpu": false,
       "heroType": 4,
-      "hp": 200,
-      "attack": 60,
-      "def": 50,
-      "shield": 100,
+      "attack": 65,
+      "hp": 140,
+      "def": 55,
+      "shield": 140,
       "speed_atk": 6.0,
       "Linggen": [
         100,

Assets/Res/Config/SkillConfig.json

@@ -5623,7 +5623,7 @@
     {
       "ID": 31011,
       "PieceID": 11005,
-      "power": 150.0,
+      "power": 120.0,
       "name": 497,
       "dec": 920,
       "attribute": 1,

Assets/Scripts/GameData/ExcelConfig/HeroModelConfig.cs

@@ -57,15 +57,15 @@ public int heroType;
 
 
 		/// <summary>
-		///生命值
+		///攻击力
 		/// </summary>
-public int hp;
+public int attack;
 
 
 		/// <summary>
-		///攻击力
+		///生命值
 		/// </summary>
-public int attack;
+public int hp;
 
 
 		/// <summary>

Assets/Scripts/GameLogic/Hero/FaBaoInfo.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using Excel2Json;
 using Fort23.UTool;
+using UnityEngine;
 
 namespace GameLogic.Hero
 {
@@ -21,8 +22,8 @@ namespace GameLogic.Hero
         public long qiangDu;
 
         public Dictionary<int, long> attriButedIC = new Dictionary<int, long>();
-        
-        public AccountFileInfo.FaBaoData FaBaoData; 
+
+        public AccountFileInfo.FaBaoData FaBaoData;
 
         public FaBaoInfo(AccountFileInfo.FaBaoData faBaoData)
         {
@@ -39,7 +40,7 @@ namespace GameLogic.Hero
         public FaBaoInfo(int id, int powerupId, int start = 1)
         {
             FaBaoData = new AccountFileInfo.FaBaoData();
-            FaBaoData.level= powerupId;
+            FaBaoData.level = powerupId;
             FaBaoData.id = id;
             // FaBaoData.useIndex = start;
             FabaoConfig = ConfigComponent.Instance.Get<FabaoConfig>(id);
@@ -56,8 +57,7 @@ namespace GameLogic.Hero
             {
                 LogTool.Error("找不到法宝技能id：" + id);
             }
-            
-            
+
 
             attriButedIC.Clear();
 
@@ -75,8 +75,8 @@ namespace GameLogic.Hero
         public void CustomInit(AccountFileInfo.FaBaoData faBaoData)
         {
             FaBaoData = faBaoData;
-            
-        
+
+
             FabaoConfig = ConfigComponent.Instance.Get<FabaoConfig>(faBaoData.id);
             FabaoPowerupConfig = ConfigComponent.Instance.Get<FabaoPowerupConfig>(faBaoData.level);
             SkillConfig = ConfigComponent.Instance.Get<SkillConfig>(FabaoConfig.SkillGroupID * 10 + FabaoPowerupConfig.SkillLevel - 1);
@@ -89,7 +89,7 @@ namespace GameLogic.Hero
             {
                 LogTool.Error("找不到法宝技能id：" + (FabaoConfig.SkillGroupID * 10 + FabaoPowerupConfig.SkillLevel - 1));
             }
-        
+
 
             attriButedIC.Clear();
 
@@ -97,13 +97,15 @@ namespace GameLogic.Hero
             for (var i = 0; i < FabaoConfig.ShuxingIDs.Length; i++)
             {
                 float attribute = GetAttriBute(FabaoConfig.ShuxingIDs[i]);
-                long value = (long)(attribute * FabaoConfig.ShuxingPara[i] * 0.01f);
+
+                long value = Mathf.RoundToInt(attribute * FabaoConfig.ShuxingPara[i] * 0.01f);
                 attriButedIC.Add(FabaoConfig.ShuxingIDs[i], value);
             }
 
-            qiangDu = (long)(FabaoPowerupConfig.Power * SkillConfig.power * 0.01f);
+            qiangDu = Mathf.RoundToInt(FabaoPowerupConfig.Power * SkillConfig.power * 0.01f);
         }
 
+
         private float GetAttriBute(int type)
         {
             switch (type)