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

Assets/Res/Config/DaoyouModelConfig.json

@@ -30,7 +30,7 @@
         22
       ],
       "daolvSkillID": [
-        112
+        1
       ],
       "EmotionLvforQuest": 2,
       "QuestID": 9003,
@@ -73,6 +73,9 @@
         21,
         32
       ],
+      "daolvSkillID": [
+        2
+      ],
       "EmotionLvforQuest": 2,
       "QuestID": 9002,
       "EmotionLvforspecialGift": [
@@ -114,6 +117,9 @@
         31,
         42
       ],
+      "daolvSkillID": [
+        3
+      ],
       "EmotionLvforQuest": 2,
       "QuestID": 9001,
       "EmotionLvforspecialGift": [
@@ -155,6 +161,9 @@
         41,
         12
       ],
+      "daolvSkillID": [
+        4
+      ],
       "EmotionLvforQuest": 3,
       "QuestID": 9002,
       "EmotionLvforspecialGift": [
@@ -196,6 +205,9 @@
         12,
         33
       ],
+      "daolvSkillID": [
+        5
+      ],
       "EmotionLvforQuest": 3,
       "QuestID": 9001,
       "EmotionLvforspecialGift": [
@@ -237,6 +249,9 @@
         22,
         43
       ],
+      "daolvSkillID": [
+        6
+      ],
       "EmotionLvforQuest": 3,
       "QuestID": 9002,
       "EmotionLvforspecialGift": [
@@ -278,6 +293,9 @@
         32,
         13
       ],
+      "daolvSkillID": [
+        7
+      ],
       "EmotionLvforQuest": 4,
       "QuestID": 9001,
       "EmotionLvforspecialGift": [
@@ -319,6 +337,9 @@
         42,
         23
       ],
+      "daolvSkillID": [
+        8
+      ],
       "EmotionLvforQuest": 4,
       "QuestID": 9002,
       "EmotionLvforspecialGift": [
@@ -360,6 +381,9 @@
         13,
         34
       ],
+      "daolvSkillID": [
+        1
+      ],
       "EmotionLvforQuest": 5,
       "QuestID": 9001,
       "EmotionLvforspecialGift": [
@@ -401,6 +425,9 @@
         23,
         44
       ],
+      "daolvSkillID": [
+        2
+      ],
       "EmotionLvforQuest": 6,
       "QuestID": 9002,
       "EmotionLvforspecialGift": [

Assets/Res/Config/LanguageChineseConfig.json

@@ -8170,55 +8170,79 @@
     },
     {
       "ID": 2043,
-      "txt": "0"
+      "txt": "开心"
     },
     {
       "ID": 2044,
-      "txt": "0"
+      "txt": "一般"
     },
     {
       "ID": 2045,
-      "txt": "0"
+      "txt": "失落"
     },
     {
       "ID": 2046,
-      "txt": "0"
+      "txt": "生命增幅"
     },
     {
       "ID": 2047,
-      "txt": "0"
+      "txt": "攻击增幅"
     },
     {
       "ID": 2048,
-      "txt": "0"
+      "txt": "防御增幅"
     },
     {
       "ID": 2049,
-      "txt": "0"
+      "txt": "金之灵根"
     },
     {
       "ID": 2050,
-      "txt": "0"
+      "txt": "水之灵根"
     },
     {
       "ID": 2051,
-      "txt": "0"
+      "txt": "木之灵根"
     },
     {
       "ID": 2052,
-      "txt": "0"
+      "txt": "火之灵根"
     },
     {
       "ID": 2053,
-      "txt": "0"
+      "txt": "土之灵根"
     },
     {
       "ID": 2054,
-      "txt": "0"
+      "txt": "玩家生命+{0}%"
     },
     {
       "ID": 2055,
-      "txt": "0"
+      "txt": "玩家攻击+{0}%"
+    },
+    {
+      "ID": 2056,
+      "txt": "玩家防御+{0}%"
+    },
+    {
+      "ID": 2057,
+      "txt": "玩家金灵根+{0}"
+    },
+    {
+      "ID": 2058,
+      "txt": "玩家水灵根+{0}"
+    },
+    {
+      "ID": 2059,
+      "txt": "玩家木灵根+{0}"
+    },
+    {
+      "ID": 2060,
+      "txt": "玩家火灵根+{0}"
+    },
+    {
+      "ID": 2061,
+      "txt": "玩家土灵根+{0}"
     }
   ]
 }

Assets/Res/Config/daolvSkill.json

@@ -1,3 +1,444 @@
 {
-  "configList": []
+  "configList": [
+    {
+      "ID": 1,
+      "Idgroup": 1,
+      "lv": 1,
+      "name": 2046,
+      "des": 2054,
+      "para": [
+        3
+      ],
+      "type": 2
+    },
+    {
+      "ID": 2,
+      "Idgroup": 1,
+      "lv": 2,
+      "name": 2046,
+      "des": 2054,
+      "para": [
+        6
+      ],
+      "type": 2
+    },
+    {
+      "ID": 3,
+      "Idgroup": 1,
+      "lv": 3,
+      "name": 2046,
+      "des": 2054,
+      "para": [
+        9
+      ],
+      "type": 2
+    },
+    {
+      "ID": 4,
+      "Idgroup": 1,
+      "lv": 4,
+      "name": 2046,
+      "des": 2054,
+      "para": [
+        12
+      ],
+      "type": 2
+    },
+    {
+      "ID": 5,
+      "Idgroup": 1,
+      "lv": 5,
+      "name": 2046,
+      "des": 2054,
+      "para": [
+        15
+      ],
+      "type": 2
+    },
+    {
+      "ID": 6,
+      "Idgroup": 2,
+      "lv": 1,
+      "name": 2047,
+      "des": 2055,
+      "para": [
+        3
+      ],
+      "type": 2
+    },
+    {
+      "ID": 7,
+      "Idgroup": 2,
+      "lv": 2,
+      "name": 2047,
+      "des": 2055,
+      "para": [
+        6
+      ],
+      "type": 2
+    },
+    {
+      "ID": 8,
+      "Idgroup": 2,
+      "lv": 3,
+      "name": 2047,
+      "des": 2055,
+      "para": [
+        9
+      ],
+      "type": 2
+    },
+    {
+      "ID": 9,
+      "Idgroup": 2,
+      "lv": 4,
+      "name": 2047,
+      "des": 2055,
+      "para": [
+        12
+      ],
+      "type": 2
+    },
+    {
+      "ID": 10,
+      "Idgroup": 2,
+      "lv": 5,
+      "name": 2047,
+      "des": 2055,
+      "para": [
+        15
+      ],
+      "type": 2
+    },
+    {
+      "ID": 11,
+      "Idgroup": 3,
+      "lv": 1,
+      "name": 2048,
+      "des": 2056,
+      "para": [
+        3
+      ],
+      "type": 2
+    },
+    {
+      "ID": 12,
+      "Idgroup": 3,
+      "lv": 2,
+      "name": 2048,
+      "des": 2056,
+      "para": [
+        6
+      ],
+      "type": 2
+    },
+    {
+      "ID": 13,
+      "Idgroup": 3,
+      "lv": 3,
+      "name": 2048,
+      "des": 2056,
+      "para": [
+        9
+      ],
+      "type": 2
+    },
+    {
+      "ID": 14,
+      "Idgroup": 3,
+      "lv": 4,
+      "name": 2048,
+      "des": 2056,
+      "para": [
+        12
+      ],
+      "type": 2
+    },
+    {
+      "ID": 15,
+      "Idgroup": 3,
+      "lv": 5,
+      "name": 2048,
+      "des": 2056,
+      "para": [
+        15
+      ],
+      "type": 2
+    },
+    {
+      "ID": 16,
+      "Idgroup": 4,
+      "lv": 1,
+      "name": 2049,
+      "des": 2057,
+      "para": [
+        2
+      ],
+      "type": 1
+    },
+    {
+      "ID": 17,
+      "Idgroup": 4,
+      "lv": 2,
+      "name": 2049,
+      "des": 2057,
+      "para": [
+        4
+      ],
+      "type": 1
+    },
+    {
+      "ID": 18,
+      "Idgroup": 4,
+      "lv": 3,
+      "name": 2049,
+      "des": 2057,
+      "para": [
+        6
+      ],
+      "type": 1
+    },
+    {
+      "ID": 19,
+      "Idgroup": 4,
+      "lv": 4,
+      "name": 2049,
+      "des": 2057,
+      "para": [
+        8
+      ],
+      "type": 1
+    },
+    {
+      "ID": 20,
+      "Idgroup": 4,
+      "lv": 5,
+      "name": 2049,
+      "des": 2057,
+      "para": [
+        10
+      ],
+      "type": 1
+    },
+    {
+      "ID": 21,
+      "Idgroup": 5,
+      "lv": 1,
+      "name": 2050,
+      "des": 2058,
+      "para": [
+        2
+      ],
+      "type": 1
+    },
+    {
+      "ID": 22,
+      "Idgroup": 5,
+      "lv": 2,
+      "name": 2050,
+      "des": 2058,
+      "para": [
+        4
+      ],
+      "type": 1
+    },
+    {
+      "ID": 23,
+      "Idgroup": 5,
+      "lv": 3,
+      "name": 2050,
+      "des": 2058,
+      "para": [
+        6
+      ],
+      "type": 1
+    },
+    {
+      "ID": 24,
+      "Idgroup": 5,
+      "lv": 4,
+      "name": 2050,
+      "des": 2058,
+      "para": [
+        8
+      ],
+      "type": 1
+    },
+    {
+      "ID": 25,
+      "Idgroup": 5,
+      "lv": 5,
+      "name": 2050,
+      "des": 2058,
+      "para": [
+        10
+      ],
+      "type": 1
+    },
+    {
+      "ID": 26,
+      "Idgroup": 6,
+      "lv": 1,
+      "name": 2051,
+      "des": 2059,
+      "para": [
+        2
+      ],
+      "type": 1
+    },
+    {
+      "ID": 27,
+      "Idgroup": 6,
+      "lv": 2,
+      "name": 2051,
+      "des": 2059,
+      "para": [
+        4
+      ],
+      "type": 1
+    },
+    {
+      "ID": 28,
+      "Idgroup": 6,
+      "lv": 3,
+      "name": 2051,
+      "des": 2059,
+      "para": [
+        6
+      ],
+      "type": 1
+    },
+    {
+      "ID": 29,
+      "Idgroup": 6,
+      "lv": 4,
+      "name": 2051,
+      "des": 2059,
+      "para": [
+        8
+      ],
+      "type": 1
+    },
+    {
+      "ID": 30,
+      "Idgroup": 6,
+      "lv": 5,
+      "name": 2051,
+      "des": 2059,
+      "para": [
+        10
+      ],
+      "type": 1
+    },
+    {
+      "ID": 31,
+      "Idgroup": 7,
+      "lv": 1,
+      "name": 2052,
+      "des": 2060,
+      "para": [
+        2
+      ],
+      "type": 1
+    },
+    {
+      "ID": 32,
+      "Idgroup": 7,
+      "lv": 2,
+      "name": 2052,
+      "des": 2060,
+      "para": [
+        4
+      ],
+      "type": 1
+    },
+    {
+      "ID": 33,
+      "Idgroup": 7,
+      "lv": 3,
+      "name": 2052,
+      "des": 2060,
+      "para": [
+        6
+      ],
+      "type": 1
+    },
+    {
+      "ID": 34,
+      "Idgroup": 7,
+      "lv": 4,
+      "name": 2052,
+      "des": 2060,
+      "para": [
+        8
+      ],
+      "type": 1
+    },
+    {
+      "ID": 35,
+      "Idgroup": 7,
+      "lv": 5,
+      "name": 2052,
+      "des": 2060,
+      "para": [
+        10
+      ],
+      "type": 1
+    },
+    {
+      "ID": 36,
+      "Idgroup": 8,
+      "lv": 1,
+      "name": 2053,
+      "des": 2061,
+      "para": [
+        2
+      ],
+      "type": 1
+    },
+    {
+      "ID": 37,
+      "Idgroup": 8,
+      "lv": 2,
+      "name": 2053,
+      "des": 2061,
+      "para": [
+        4
+      ],
+      "type": 1
+    },
+    {
+      "ID": 38,
+      "Idgroup": 8,
+      "lv": 3,
+      "name": 2053,
+      "des": 2061,
+      "para": [
+        6
+      ],
+      "type": 1
+    },
+    {
+      "ID": 39,
+      "Idgroup": 8,
+      "lv": 4,
+      "name": 2053,
+      "des": 2061,
+      "para": [
+        8
+      ],
+      "type": 1
+    },
+    {
+      "ID": 40,
+      "Idgroup": 8,
+      "lv": 5,
+      "name": 2053,
+      "des": 2061,
+      "para": [
+        10
+      ],
+      "type": 1
+    }
+  ]
 }

Assets/Res/Config/emotionConfig.json

@@ -1,3 +1,25 @@
 {
-  "configList": []
+  "configList": [
+    {
+      "ID": 1,
+      "type": 1,
+      "icon": "",
+      "des": 2043,
+      "hanganUpRate": 200
+    },
+    {
+      "ID": 2,
+      "type": 2,
+      "icon": "",
+      "des": 2044,
+      "hanganUpRate": 0
+    },
+    {
+      "ID": 3,
+      "type": 3,
+      "icon": "",
+      "des": 2045,
+      "hanganUpRate": -200
+    }
+  ]
 }

Assets/Scripts/GameData/ExcelConfig/daolvSkill.cs

@@ -32,6 +32,30 @@ public int Idgroup;
 public int lv;
 
 
+		/// <summary>
+		///名称
+		/// </summary>
+public int name;
+
+
+		/// <summary>
+		///描述
+		/// </summary>
+public int des;
+
+
+		/// <summary>
+		///参数
+		/// </summary>
+public int[] para;
+
+
+		/// <summary>
+		///类型 1=唯一 2=叠加
+		/// </summary>
+public int type;
+
+
 	}
 
 }

Assets/Scripts/GameData/ExcelConfig/emotionConfig.cs

@@ -0,0 +1,50 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\DaoyouConfig.xlsx. SheetName: emotionConfig
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "emotionConfig.json")]
+	public partial class emotionConfigHolder : ConfigHolder<emotionConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct emotionConfig : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///ID
+		/// </summary>
+public int ID;
+
+
+		/// <summary>
+		///类型 1=好心情 2=平衡心情 3=坏心情
+		/// </summary>
+public int type;
+
+
+		/// <summary>
+		///icon
+		/// </summary>
+public string icon;
+
+
+		/// <summary>
+		///描述ID
+		/// </summary>
+public int des;
+
+
+		/// <summary>
+		///增加好感度的加成比例 100=10%
+		/// </summary>
+public int hanganUpRate;
+
+
+	}
+
+}
+// End of Auto Generated Code