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

# Conflicts:
#	Assets/Res/Config/DaoyouModelConfig.json   resolved by origin/master(远端) version
#	Excel2Json/Excel/DaoyouConfig.xlsx   resolved by origin/master(远端) version

Assets/Res/Config/DaoyouGiftConfig.json

@@ -0,0 +1,319 @@
+{
+  "configList": [
+    {
+      "ID": 1,
+      "ItemID": 1201,
+      "emotionValue": 10
+    },
+    {
+      "ID": 2,
+      "ItemID": 1202,
+      "emotionValue": 20
+    },
+    {
+      "ID": 3,
+      "ItemID": 1203,
+      "emotionValue": 30
+    },
+    {
+      "ID": 4,
+      "ItemID": 1204,
+      "emotionValue": 10
+    },
+    {
+      "ID": 5,
+      "ItemID": 1205,
+      "emotionValue": 20
+    },
+    {
+      "ID": 6,
+      "ItemID": 1206,
+      "emotionValue": 30
+    },
+    {
+      "ID": 7,
+      "ItemID": 1207,
+      "emotionValue": 10
+    },
+    {
+      "ID": 8,
+      "ItemID": 1208,
+      "emotionValue": 20
+    },
+    {
+      "ID": 9,
+      "ItemID": 1209,
+      "emotionValue": 30
+    },
+    {
+      "ID": 10,
+      "ItemID": 1301,
+      "emotionValue": 10
+    },
+    {
+      "ID": 11,
+      "ItemID": 1302,
+      "emotionValue": 15
+    },
+    {
+      "ID": 12,
+      "ItemID": 1303,
+      "emotionValue": 20
+    },
+    {
+      "ID": 13,
+      "ItemID": 1304,
+      "emotionValue": 25
+    },
+    {
+      "ID": 14,
+      "ItemID": 1401,
+      "emotionValue": 10
+    },
+    {
+      "ID": 15,
+      "ItemID": 1402,
+      "emotionValue": 15
+    },
+    {
+      "ID": 16,
+      "ItemID": 1403,
+      "emotionValue": 20
+    },
+    {
+      "ID": 17,
+      "ItemID": 1404,
+      "emotionValue": 30
+    },
+    {
+      "ID": 18,
+      "ItemID": 1501,
+      "emotionValue": 50
+    },
+    {
+      "ID": 19,
+      "ItemID": 1502,
+      "emotionValue": 100
+    },
+    {
+      "ID": 20,
+      "ItemID": 11001,
+      "emotionValue": 20
+    },
+    {
+      "ID": 21,
+      "ItemID": 11002,
+      "emotionValue": 20
+    },
+    {
+      "ID": 22,
+      "ItemID": 11003,
+      "emotionValue": 20
+    },
+    {
+      "ID": 23,
+      "ItemID": 11004,
+      "emotionValue": 20
+    },
+    {
+      "ID": 24,
+      "ItemID": 11005,
+      "emotionValue": 20
+    },
+    {
+      "ID": 25,
+      "ItemID": 11006,
+      "emotionValue": 20
+    },
+    {
+      "ID": 26,
+      "ItemID": 11007,
+      "emotionValue": 20
+    },
+    {
+      "ID": 27,
+      "ItemID": 11008,
+      "emotionValue": 20
+    },
+    {
+      "ID": 28,
+      "ItemID": 11009,
+      "emotionValue": 20
+    },
+    {
+      "ID": 29,
+      "ItemID": 11010,
+      "emotionValue": 20
+    },
+    {
+      "ID": 30,
+      "ItemID": 11011,
+      "emotionValue": 20
+    },
+    {
+      "ID": 31,
+      "ItemID": 13001,
+      "emotionValue": 20
+    },
+    {
+      "ID": 32,
+      "ItemID": 13002,
+      "emotionValue": 20
+    },
+    {
+      "ID": 33,
+      "ItemID": 13003,
+      "emotionValue": 20
+    },
+    {
+      "ID": 34,
+      "ItemID": 13004,
+      "emotionValue": 20
+    },
+    {
+      "ID": 35,
+      "ItemID": 13005,
+      "emotionValue": 20
+    },
+    {
+      "ID": 36,
+      "ItemID": 13006,
+      "emotionValue": 20
+    },
+    {
+      "ID": 37,
+      "ItemID": 13007,
+      "emotionValue": 20
+    },
+    {
+      "ID": 38,
+      "ItemID": 13008,
+      "emotionValue": 20
+    },
+    {
+      "ID": 39,
+      "ItemID": 13009,
+      "emotionValue": 20
+    },
+    {
+      "ID": 40,
+      "ItemID": 13010,
+      "emotionValue": 20
+    },
+    {
+      "ID": 41,
+      "ItemID": 13011,
+      "emotionValue": 20
+    },
+    {
+      "ID": 42,
+      "ItemID": 13012,
+      "emotionValue": 20
+    },
+    {
+      "ID": 43,
+      "ItemID": 13013,
+      "emotionValue": 20
+    },
+    {
+      "ID": 44,
+      "ItemID": 13014,
+      "emotionValue": 20
+    },
+    {
+      "ID": 45,
+      "ItemID": 13015,
+      "emotionValue": 20
+    },
+    {
+      "ID": 46,
+      "ItemID": 13016,
+      "emotionValue": 20
+    },
+    {
+      "ID": 47,
+      "ItemID": 13017,
+      "emotionValue": 20
+    },
+    {
+      "ID": 48,
+      "ItemID": 13018,
+      "emotionValue": 20
+    },
+    {
+      "ID": 49,
+      "ItemID": 13019,
+      "emotionValue": 20
+    },
+    {
+      "ID": 50,
+      "ItemID": 13020,
+      "emotionValue": 20
+    },
+    {
+      "ID": 51,
+      "ItemID": 13021,
+      "emotionValue": 20
+    },
+    {
+      "ID": 52,
+      "ItemID": 13022,
+      "emotionValue": 20
+    },
+    {
+      "ID": 53,
+      "ItemID": 13023,
+      "emotionValue": 20
+    },
+    {
+      "ID": 54,
+      "ItemID": 13024,
+      "emotionValue": 20
+    },
+    {
+      "ID": 55,
+      "ItemID": 13025,
+      "emotionValue": 20
+    },
+    {
+      "ID": 56,
+      "ItemID": 13501,
+      "emotionValue": 20
+    },
+    {
+      "ID": 57,
+      "ItemID": 13502,
+      "emotionValue": 20
+    },
+    {
+      "ID": 58,
+      "ItemID": 13503,
+      "emotionValue": 20
+    },
+    {
+      "ID": 59,
+      "ItemID": 13504,
+      "emotionValue": 20
+    },
+    {
+      "ID": 60,
+      "ItemID": 13505,
+      "emotionValue": 20
+    },
+    {
+      "ID": 61,
+      "ItemID": 13506,
+      "emotionValue": 20
+    },
+    {
+      "ID": 62,
+      "ItemID": 13507,
+      "emotionValue": 20
+    },
+    {
+      "ID": 63,
+      "ItemID": 13508,
+      "emotionValue": 20
+    }
+  ]
+}

Assets/Res/Config/DaoyouLevelupConfig.json

@@ -1,34 +1,118 @@
 {
   "configList": [
     {
-      "ID": 1
+      "ID": 1,
+      "name": null,
+      "exp": 10,
+      "guajiGrowup": 0
     },
     {
-      "ID": 2
+      "ID": 2,
+      "name": null,
+      "exp": 20,
+      "prizeID": [
+        1002
+      ],
+      "prizeNum": [
+        1
+      ],
+      "guajiGrowup": 100
     },
     {
-      "ID": 3
+      "ID": 3,
+      "name": null,
+      "exp": 30,
+      "prizeID": [
+        1002
+      ],
+      "prizeNum": [
+        1
+      ],
+      "guajiGrowup": 120
     },
     {
-      "ID": 4
+      "ID": 4,
+      "name": null,
+      "exp": 40,
+      "prizeID": [
+        1002
+      ],
+      "prizeNum": [
+        1
+      ],
+      "guajiGrowup": 140
     },
     {
-      "ID": 5
+      "ID": 5,
+      "name": null,
+      "exp": 50,
+      "prizeID": [
+        1002
+      ],
+      "prizeNum": [
+        1
+      ],
+      "guajiGrowup": 160
     },
     {
-      "ID": 6
+      "ID": 6,
+      "name": null,
+      "exp": 60,
+      "prizeID": [
+        1002
+      ],
+      "prizeNum": [
+        1
+      ],
+      "guajiGrowup": 180
     },
     {
-      "ID": 7
+      "ID": 7,
+      "name": null,
+      "exp": 70,
+      "prizeID": [
+        1002
+      ],
+      "prizeNum": [
+        1
+      ],
+      "guajiGrowup": 200
     },
     {
-      "ID": 8
+      "ID": 8,
+      "name": null,
+      "exp": 80,
+      "prizeID": [
+        1002
+      ],
+      "prizeNum": [
+        1
+      ],
+      "guajiGrowup": 220
     },
     {
-      "ID": 9
+      "ID": 9,
+      "name": null,
+      "exp": 90,
+      "prizeID": [
+        1002
+      ],
+      "prizeNum": [
+        1
+      ],
+      "guajiGrowup": 240
     },
     {
-      "ID": 10
+      "ID": 10,
+      "name": null,
+      "exp": -1,
+      "prizeID": [
+        1002
+      ],
+      "prizeNum": [
+        1
+      ],
+      "guajiGrowup": 260
     }
   ]
 }

Assets/Res/Config/DaoyouModelConfig.json

@@ -2,9 +2,27 @@
   "configList": [
     {
       "ID": 1,
-      "name": null,
+      "name": 1953,
       "quality": 2,
       "growupRate": 60,
+      "des": [
+        1963,
+        1964,
+        1965
+      ],
+      "desUnlockLv": [
+        1,
+        3,
+        6
+      ],
+      "PreferGiftID": [
+        1201,
+        1202,
+        1203
+      ],
+      "shownPreferGiftID": [
+        1201
+      ],
       "daolvBuffType": [
         112
       ],
@@ -28,73 +46,235 @@
     },
     {
       "ID": 2,
-      "name": null,
+      "name": 1954,
       "quality": 2,
       "growupRate": 60,
+      "des": [
+        1966,
+        1967,
+        1968
+      ],
+      "desUnlockLv": [
+        1,
+        3,
+        6
+      ],
+      "PreferGiftID": [
+        1204,
+        1205,
+        1206
+      ],
+      "shownPreferGiftID": [
+        1204
+      ],
       "EmotionLvforQuest": null,
       "QuestID": null
     },
     {
       "ID": 3,
-      "name": null,
+      "name": 1955,
       "quality": 2,
       "growupRate": 60,
+      "des": [
+        1969,
+        1970,
+        1971
+      ],
+      "desUnlockLv": [
+        1,
+        3,
+        6
+      ],
+      "PreferGiftID": [
+        1207,
+        1208,
+        1209
+      ],
+      "shownPreferGiftID": [
+        1207
+      ],
       "EmotionLvforQuest": null,
       "QuestID": null
     },
     {
       "ID": 4,
-      "name": null,
+      "name": 1956,
       "quality": 3,
       "growupRate": 80,
+      "des": [
+        1972,
+        1973,
+        1974
+      ],
+      "desUnlockLv": [
+        1,
+        3,
+        6
+      ],
+      "PreferGiftID": [
+        1301,
+        1302,
+        1303
+      ],
+      "shownPreferGiftID": [
+        1301
+      ],
       "EmotionLvforQuest": null,
       "QuestID": null
     },
     {
       "ID": 5,
-      "name": null,
+      "name": 1957,
       "quality": 3,
       "growupRate": 80,
+      "des": [
+        1975,
+        1976,
+        1977
+      ],
+      "desUnlockLv": [
+        1,
+        3,
+        6
+      ],
+      "PreferGiftID": [
+        1401,
+        1402,
+        1403
+      ],
+      "shownPreferGiftID": [
+        1401
+      ],
       "EmotionLvforQuest": null,
       "QuestID": null
     },
     {
       "ID": 6,
-      "name": null,
+      "name": 1958,
       "quality": 3,
       "growupRate": 80,
+      "des": [
+        1978,
+        1979,
+        1980
+      ],
+      "desUnlockLv": [
+        1,
+        3,
+        6
+      ],
+      "PreferGiftID": [
+        1201,
+        1202,
+        1203
+      ],
+      "shownPreferGiftID": [
+        1201
+      ],
       "EmotionLvforQuest": null,
       "QuestID": null
     },
     {
       "ID": 7,
-      "name": null,
+      "name": 1959,
       "quality": 4,
       "growupRate": 100,
+      "des": [
+        1981,
+        1982,
+        1983
+      ],
+      "desUnlockLv": [
+        1,
+        3,
+        6
+      ],
+      "PreferGiftID": [
+        1204,
+        1205,
+        1206
+      ],
+      "shownPreferGiftID": [
+        1204
+      ],
       "EmotionLvforQuest": null,
       "QuestID": null
     },
     {
       "ID": 8,
-      "name": null,
+      "name": 1960,
       "quality": 4,
       "growupRate": 100,
+      "des": [
+        1984,
+        1985,
+        1986
+      ],
+      "desUnlockLv": [
+        1,
+        3,
+        6
+      ],
+      "PreferGiftID": [
+        1207,
+        1208,
+        1209
+      ],
+      "shownPreferGiftID": [
+        1207
+      ],
       "EmotionLvforQuest": null,
       "QuestID": null
     },
     {
       "ID": 9,
-      "name": null,
+      "name": 1961,
       "quality": 5,
       "growupRate": 110,
+      "des": [
+        1987,
+        1988,
+        1989
+      ],
+      "desUnlockLv": [
+        1,
+        3,
+        6
+      ],
+      "PreferGiftID": [
+        1301,
+        1302,
+        1303
+      ],
+      "shownPreferGiftID": [
+        1301
+      ],
       "EmotionLvforQuest": null,
       "QuestID": null
     },
     {
       "ID": 10,
-      "name": null,
+      "name": 1962,
       "quality": 6,
       "growupRate": 120,
+      "des": [
+        1990,
+        1991,
+        1992
+      ],
+      "desUnlockLv": [
+        1,
+        3,
+        6
+      ],
+      "PreferGiftID": [
+        1401,
+        1402,
+        1403
+      ],
+      "shownPreferGiftID": [
+        1401
+      ],
       "EmotionLvforQuest": null,
       "QuestID": null
     }

Assets/Res/Config/DaoyouguajiResourcLevel.json

@@ -0,0 +1,469 @@
+{
+  "configList": [
+    {
+      "ID": 1,
+      "para1": null,
+      "para2": null,
+      "para3": null,
+      "para4": null,
+      "para5": null,
+      "para6": null,
+      "para7": null,
+      "para8": null,
+      "para9": null,
+      "para10": null,
+      "para11": null,
+      "para12": null
+    },
+    {
+      "ID": 2,
+      "para1": null,
+      "para2": null,
+      "para3": null,
+      "para4": null,
+      "para5": null,
+      "para6": null,
+      "para7": null,
+      "para8": null,
+      "para9": null,
+      "para10": null,
+      "para11": null,
+      "para12": null
+    },
+    {
+      "ID": 3,
+      "para1": null,
+      "para2": null,
+      "para3": null,
+      "para4": null,
+      "para5": null,
+      "para6": null,
+      "para7": null,
+      "para8": null,
+      "para9": null,
+      "para10": null,
+      "para11": null,
+      "para12": null
+    },
+    {
+      "ID": 4,
+      "para1": null,
+      "para2": null,
+      "para3": null,
+      "para4": null,
+      "para5": null,
+      "para6": null,
+      "para7": null,
+      "para8": null,
+      "para9": null,
+      "para10": null,
+      "para11": null,
+      "para12": null
+    },
+    {
+      "ID": 5,
+      "para1": null,
+      "para2": null,
+      "para3": null,
+      "para4": null,
+      "para5": null,
+      "para6": null,
+      "para7": null,
+      "para8": null,
+      "para9": null,
+      "para10": null,
+      "para11": null,
+      "para12": null
+    },
+    {
+      "ID": 6,
+      "para1": null,
+      "para2": null,
+      "para3": null,
+      "para4": null,
+      "para5": null,
+      "para6": null,
+      "para7": null,
+      "para8": null,
+      "para9": null,
+      "para10": null,
+      "para11": null,
+      "para12": null
+    },
+    {
+      "ID": 7,
+      "para1": null,
+      "para2": null,
+      "para3": null,
+      "para4": null,
+      "para5": null,
+      "para6": null,
+      "para7": null,
+      "para8": null,
+      "para9": null,
+      "para10": null,
+      "para11": null,
+      "para12": null
+    },
+    {
+      "ID": 8,
+      "para1": null,
+      "para2": null,
+      "para3": null,
+      "para4": null,
+      "para5": null,
+      "para6": null,
+      "para7": null,
+      "para8": null,
+      "para9": null,
+      "para10": null,
+      "para11": null,
+      "para12": null
+    },
+    {
+      "ID": 9,
+      "para1": null,
+      "para2": null,
+      "para3": null,
+      "para4": null,
+      "para5": null,
+      "para6": null,
+      "para7": null,
+      "para8": null,
+      "para9": null,
+      "para10": null,
+      "para11": null,
+      "para12": null
+    },
+    {
+      "ID": 10,
+      "para1": 100,
+      "para2": null,
+      "para3": null,
+      "para4": null,
+      "para5": null,
+      "para6": null,
+      "para7": null,
+      "para8": null,
+      "para9": null,
+      "para10": null,
+      "para11": null,
+      "para12": null
+    },
+    {
+      "ID": 11,
+      "para1": null,
+      "para2": null,
+      "para3": null,
+      "para4": null,
+      "para5": null,
+      "para6": null,
+      "para7": null,
+      "para8": null,
+      "para9": null,
+      "para10": null,
+      "para11": null,
+      "para12": null
+    },
+    {
+      "ID": 12,
+      "para1": null,
+      "para2": null,
+      "para3": null,
+      "para4": null,
+      "para5": null,
+      "para6": null,
+      "para7": null,
+      "para8": null,
+      "para9": null,
+      "para10": null,
+      "para11": null,
+      "para12": null
+    },
+    {
+      "ID": 13,
+      "para1": null,
+      "para2": null,
+      "para3": null,
+      "para4": null,
+      "para5": null,
+      "para6": null,
+      "para7": null,
+      "para8": null,
+      "para9": null,
+      "para10": null,
+      "para11": null,
+      "para12": null
+    },
+    {
+      "ID": 14,
+      "para1": null,
+      "para2": null,
+      "para3": null,
+      "para4": null,
+      "para5": null,
+      "para6": null,
+      "para7": null,
+      "para8": null,
+      "para9": null,
+      "para10": null,
+      "para11": null,
+      "para12": null
+    },
+    {
+      "ID": 15,
+      "para1": null,
+      "para2": null,
+      "para3": null,
+      "para4": null,
+      "para5": null,
+      "para6": null,
+      "para7": null,
+      "para8": null,
+      "para9": null,
+      "para10": null,
+      "para11": null,
+      "para12": null
+    },
+    {
+      "ID": 16,
+      "para1": null,
+      "para2": null,
+      "para3": null,
+      "para4": null,
+      "para5": null,
+      "para6": null,
+      "para7": null,
+      "para8": null,
+      "para9": null,
+      "para10": null,
+      "para11": null,
+      "para12": null
+    },
+    {
+      "ID": 17,
+      "para1": null,
+      "para2": null,
+      "para3": null,
+      "para4": null,
+      "para5": null,
+      "para6": null,
+      "para7": null,
+      "para8": null,
+      "para9": null,
+      "para10": null,
+      "para11": null,
+      "para12": null
+    },
+    {
+      "ID": 18,
+      "para1": null,
+      "para2": null,
+      "para3": null,
+      "para4": null,
+      "para5": null,
+      "para6": null,
+      "para7": null,
+      "para8": null,
+      "para9": null,
+      "para10": null,
+      "para11": null,
+      "para12": null
+    },
+    {
+      "ID": 19,
+      "para1": null,
+      "para2": null,
+      "para3": null,
+      "para4": null,
+      "para5": null,
+      "para6": null,
+      "para7": null,
+      "para8": null,
+      "para9": null,
+      "para10": null,
+      "para11": null,
+      "para12": null
+    },
+    {
+      "ID": 20,
+      "para1": null,
+      "para2": null,
+      "para3": null,
+      "para4": null,
+      "para5": null,
+      "para6": null,
+      "para7": null,
+      "para8": null,
+      "para9": null,
+      "para10": null,
+      "para11": null,
+      "para12": null
+    },
+    {
+      "ID": 21,
+      "para1": null,
+      "para2": null,
+      "para3": null,
+      "para4": null,
+      "para5": null,
+      "para6": null,
+      "para7": null,
+      "para8": null,
+      "para9": null,
+      "para10": null,
+      "para11": null,
+      "para12": null
+    },
+    {
+      "ID": 22,
+      "para1": null,
+      "para2": null,
+      "para3": null,
+      "para4": null,
+      "para5": null,
+      "para6": null,
+      "para7": null,
+      "para8": null,
+      "para9": null,
+      "para10": null,
+      "para11": null,
+      "para12": null
+    },
+    {
+      "ID": 23,
+      "para1": null,
+      "para2": null,
+      "para3": null,
+      "para4": null,
+      "para5": null,
+      "para6": null,
+      "para7": null,
+      "para8": null,
+      "para9": null,
+      "para10": null,
+      "para11": null,
+      "para12": null
+    },
+    {
+      "ID": 24,
+      "para1": null,
+      "para2": null,
+      "para3": null,
+      "para4": null,
+      "para5": null,
+      "para6": null,
+      "para7": null,
+      "para8": null,
+      "para9": null,
+      "para10": null,
+      "para11": null,
+      "para12": null
+    },
+    {
+      "ID": 25,
+      "para1": null,
+      "para2": null,
+      "para3": null,
+      "para4": null,
+      "para5": null,
+      "para6": null,
+      "para7": null,
+      "para8": null,
+      "para9": null,
+      "para10": null,
+      "para11": null,
+      "para12": null
+    },
+    {
+      "ID": 26,
+      "para1": null,
+      "para2": null,
+      "para3": null,
+      "para4": null,
+      "para5": null,
+      "para6": null,
+      "para7": null,
+      "para8": null,
+      "para9": null,
+      "para10": null,
+      "para11": null,
+      "para12": null
+    },
+    {
+      "ID": 27,
+      "para1": null,
+      "para2": null,
+      "para3": null,
+      "para4": null,
+      "para5": null,
+      "para6": null,
+      "para7": null,
+      "para8": null,
+      "para9": null,
+      "para10": null,
+      "para11": null,
+      "para12": null
+    },
+    {
+      "ID": 28,
+      "para1": null,
+      "para2": null,
+      "para3": null,
+      "para4": null,
+      "para5": null,
+      "para6": null,
+      "para7": null,
+      "para8": null,
+      "para9": null,
+      "para10": null,
+      "para11": null,
+      "para12": null
+    },
+    {
+      "ID": 29,
+      "para1": null,
+      "para2": null,
+      "para3": null,
+      "para4": null,
+      "para5": null,
+      "para6": null,
+      "para7": null,
+      "para8": null,
+      "para9": null,
+      "para10": null,
+      "para11": null,
+      "para12": null
+    },
+    {
+      "ID": 30,
+      "para1": null,
+      "para2": null,
+      "para3": null,
+      "para4": null,
+      "para5": null,
+      "para6": null,
+      "para7": null,
+      "para8": null,
+      "para9": null,
+      "para10": null,
+      "para11": null,
+      "para12": null
+    },
+    {
+      "ID": 31,
+      "para1": null,
+      "para2": null,
+      "para3": null,
+      "para4": null,
+      "para5": null,
+      "para6": null,
+      "para7": null,
+      "para8": null,
+      "para9": null,
+      "para10": null,
+      "para11": null,
+      "para12": null
+    }
+  ]
+}

Assets/Res/Config/ItemConfig.json

@@ -661,6 +661,90 @@
       "sort": null,
       "itemDesc_1": null
     },
+    {
+      "ID": 1501,
+      "itemName": 1947,
+      "itemDesc": 1949,
+      "icon": "icon_item_1501",
+      "itemTag": 6,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "associateVlaue": [
+        0
+      ],
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 1502,
+      "itemName": 1948,
+      "itemDesc": 1950,
+      "icon": "icon_item_1502",
+      "itemTag": 6,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "associateVlaue": [
+        0
+      ],
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 1601,
+      "itemName": 1951,
+      "itemDesc": 1952,
+      "icon": "icon_item_1601",
+      "itemTag": 7,
+      "quality": 2,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 5,
+      "associateVlaue": [
+        10
+      ],
+      "sort": null,
+      "itemDesc_1": null
+    },
     {
       "ID": 10001,
       "itemName": 284,

Assets/Res/Config/LanguageChineseConfig.json

@@ -7786,187 +7786,187 @@
     },
     {
       "ID": 1947,
-      "txt": "0"
+      "txt": "好感度礼物1"
     },
     {
       "ID": 1948,
-      "txt": "0"
+      "txt": "好感度礼物2"
     },
     {
       "ID": 1949,
-      "txt": "0"
+      "txt": "道具描述_好感度礼物1"
     },
     {
       "ID": 1950,
-      "txt": "0"
+      "txt": "道具描述_好感度礼物2"
     },
     {
       "ID": 1951,
-      "txt": "0"
+      "txt": "心情礼物"
     },
     {
       "ID": 1952,
-      "txt": "0"
+      "txt": "道具描述_心情礼物"
     },
     {
       "ID": 1953,
-      "txt": "0"
+      "txt": "道友1"
     },
     {
       "ID": 1954,
-      "txt": "0"
+      "txt": "道友2"
     },
     {
       "ID": 1955,
-      "txt": "0"
+      "txt": "道友3"
     },
     {
       "ID": 1956,
-      "txt": "0"
+      "txt": "道友4"
     },
     {
       "ID": 1957,
-      "txt": "0"
+      "txt": "道友5"
     },
     {
       "ID": 1958,
-      "txt": "0"
+      "txt": "道友6"
     },
     {
       "ID": 1959,
-      "txt": "0"
+      "txt": "道友7"
     },
     {
       "ID": 1960,
-      "txt": "0"
+      "txt": "道友8"
     },
     {
       "ID": 1961,
-      "txt": "0"
+      "txt": "道友9"
     },
     {
       "ID": 1962,
-      "txt": "0"
+      "txt": "道友10"
     },
     {
       "ID": 1963,
-      "txt": "0"
+      "txt": "道友_1_介绍文本1"
     },
     {
       "ID": 1964,
-      "txt": "0"
+      "txt": "道友_1_介绍文本2"
     },
     {
       "ID": 1965,
-      "txt": "0"
+      "txt": "道友_1_介绍文本3"
     },
     {
       "ID": 1966,
-      "txt": "0"
+      "txt": "道友_2_介绍文本1"
     },
     {
       "ID": 1967,
-      "txt": "0"
+      "txt": "道友_2_介绍文本2"
     },
     {
       "ID": 1968,
-      "txt": "0"
+      "txt": "道友_2_介绍文本3"
     },
     {
       "ID": 1969,
-      "txt": "0"
+      "txt": "道友_3_介绍文本1"
     },
     {
       "ID": 1970,
-      "txt": "0"
+      "txt": "道友_3_介绍文本2"
     },
     {
       "ID": 1971,
-      "txt": "0"
+      "txt": "道友_3_介绍文本3"
     },
     {
       "ID": 1972,
-      "txt": "0"
+      "txt": "道友_4_介绍文本1"
     },
     {
       "ID": 1973,
-      "txt": "0"
+      "txt": "道友_4_介绍文本2"
     },
     {
       "ID": 1974,
-      "txt": "0"
+      "txt": "道友_4_介绍文本3"
     },
     {
       "ID": 1975,
-      "txt": "0"
+      "txt": "道友_5_介绍文本1"
     },
     {
       "ID": 1976,
-      "txt": "0"
+      "txt": "道友_5_介绍文本2"
     },
     {
       "ID": 1977,
-      "txt": "0"
+      "txt": "道友_5_介绍文本3"
     },
     {
       "ID": 1978,
-      "txt": "0"
+      "txt": "道友_6_介绍文本1"
     },
     {
       "ID": 1979,
-      "txt": "0"
+      "txt": "道友_6_介绍文本2"
     },
     {
       "ID": 1980,
-      "txt": "0"
+      "txt": "道友_6_介绍文本3"
     },
     {
       "ID": 1981,
-      "txt": "0"
+      "txt": "道友_7_介绍文本1"
     },
     {
       "ID": 1982,
-      "txt": "0"
+      "txt": "道友_7_介绍文本2"
     },
     {
       "ID": 1983,
-      "txt": "0"
+      "txt": "道友_7_介绍文本3"
     },
     {
       "ID": 1984,
-      "txt": "0"
+      "txt": "道友_8_介绍文本1"
     },
     {
       "ID": 1985,
-      "txt": "0"
+      "txt": "道友_8_介绍文本2"
     },
     {
       "ID": 1986,
-      "txt": "0"
+      "txt": "道友_8_介绍文本3"
     },
     {
       "ID": 1987,
-      "txt": "0"
+      "txt": "道友_9_介绍文本1"
     },
     {
       "ID": 1988,
-      "txt": "0"
+      "txt": "道友_9_介绍文本2"
     },
     {
       "ID": 1989,
-      "txt": "0"
+      "txt": "道友_9_介绍文本3"
     },
     {
       "ID": 1990,
-      "txt": "0"
+      "txt": "道友_10_介绍文本1"
     },
     {
       "ID": 1991,
-      "txt": "0"
+      "txt": "道友_10_介绍文本2"
     },
     {
       "ID": 1992,
-      "txt": "0"
+      "txt": "道友_10_介绍文本3"
     },
     {
       "ID": 1993,

Assets/Res/Config/guajibuff.json

@@ -0,0 +1,18 @@
+{
+  "configList": [
+    {
+      "ID": 1,
+      "name": null,
+      "Quality": null,
+      "paraValue": null,
+      "des": null
+    },
+    {
+      "ID": 2,
+      "name": null,
+      "Quality": null,
+      "paraValue": null,
+      "des": null
+    }
+  ]
+}

Assets/Scripts/GameData/ExcelConfig/DaoyouGiftConfig.cs

@@ -0,0 +1,38 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\DaoyouConfig.xlsx. SheetName: DaoyouGiftConfig
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "DaoyouGiftConfig.json")]
+	public partial class DaoyouGiftConfigHolder : ConfigHolder<DaoyouGiftConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct DaoyouGiftConfig : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///ID
+		/// </summary>
+public int ID;
+
+
+		/// <summary>
+		///道具ID
+		/// </summary>
+public int ItemID;
+
+
+		/// <summary>
+		///默认增加的好感度值
+		/// </summary>
+public int emotionValue;
+
+
+	}
+
+}
+// End of Auto Generated Code

Assets/Scripts/GameData/ExcelConfig/DaoyouLevelupConfig.cs

@@ -23,31 +23,31 @@ public int ID;
 		/// <summary>
 		///名称
 		/// </summary>
-public int Column1;
+public int name;
 
 
 		/// <summary>
 		///升级所需经验
 		/// </summary>
-public int Column3;
+public int exp;
 
 
 		/// <summary>
 		///道具奖励ID
 		/// </summary>
-public int[] Column4;
+public int[] prizeID;
 
 
 		/// <summary>
 		///道具奖励数量
 		/// </summary>
-public int[] Column5;
+public int[] prizeNum;
 
 
 		/// <summary>
 		///挂机增益成长率 100=100%
 		/// </summary>
-public int Column6;
+public int guajiGrowup;
 
 
 	}

Assets/Scripts/GameData/ExcelConfig/DaoyouModelConfig.cs

@@ -69,7 +69,7 @@ public int[] guajiBuffID;
 
 
 		/// <summary>
-		///挂机增益初值
+		///挂机增益比例
 		/// </summary>
 public int[] guajiBuffValue;
 

Assets/Scripts/GameData/ExcelConfig/DaoyouguajiResourcLevel.cs

@@ -0,0 +1,98 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\DaoyouConfig.xlsx. SheetName: DaoyouguajiResourcLevel
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "DaoyouguajiResourcLevel.json")]
+	public partial class DaoyouguajiResourcLevelHolder : ConfigHolder<DaoyouguajiResourcLevel>
	{
+	}
+
+
+	[Serializable]
+	public struct DaoyouguajiResourcLevel : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///ID
+		/// </summary>
+public int ID;
+
+
+		/// <summary>
+		///玩家修为产出
+		/// </summary>
+public int para1;
+
+
+		/// <summary>
+		///铜钱产出
+		/// </summary>
+public int para2;
+
+
+		/// <summary>
+		///银锭产出
+		/// </summary>
+public int para3;
+
+
+		/// <summary>
+		///玩家修为产出
+		/// </summary>
+public int para4;
+
+
+		/// <summary>
+		///玩家修为产出
+		/// </summary>
+public int para5;
+
+
+		/// <summary>
+		///玩家修为产出
+		/// </summary>
+public int para6;
+
+
+		/// <summary>
+		///玩家修为产出
+		/// </summary>
+public int para7;
+
+
+		/// <summary>
+		///玩家修为产出
+		/// </summary>
+public int para8;
+
+
+		/// <summary>
+		///玩家修为产出
+		/// </summary>
+public int para9;
+
+
+		/// <summary>
+		///玩家修为产出
+		/// </summary>
+public int para10;
+
+
+		/// <summary>
+		///玩家修为产出
+		/// </summary>
+public int para11;
+
+
+		/// <summary>
+		///玩家修为产出
+		/// </summary>
+public int para12;
+
+
+	}
+
+}
+// End of Auto Generated Code

Assets/Scripts/GameData/ExcelConfig/guajibuff.cs

@@ -0,0 +1,50 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\DaoyouConfig.xlsx. SheetName: guajibuff
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "guajibuff.json")]
+	public partial class guajibuffHolder : ConfigHolder<guajibuff>
	{
+	}
+
+
+	[Serializable]
+	public struct guajibuff : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///ID
+		/// </summary>
+public int ID;
+
+
+		/// <summary>
+		///名称
+		/// </summary>
+public int name;
+
+
+		/// <summary>
+		///品质
+		/// </summary>
+public int Quality;
+
+
+		/// <summary>
+		///对应的para值
+		/// </summary>
+public int paraValue;
+
+
+		/// <summary>
+		///描述
+		/// </summary>
+public int des;
+
+
+	}
+
+}
+// End of Auto Generated Code