1

Assets/Res/Config/DropConfig.json

@@ -5,826 +5,1210 @@
       "dropGroupID": [
         1001
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        1001
+      ]
     },
     {
       "ID": 1002,
       "dropGroupID": [
         1002
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        1002
+      ]
     },
     {
       "ID": 1003,
       "dropGroupID": [
         1003
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        1003
+      ]
     },
     {
       "ID": 1004,
       "dropGroupID": [
         1004
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        1004
+      ]
     },
     {
       "ID": 1005,
       "dropGroupID": [
         1005
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        1005
+      ]
     },
     {
       "ID": 1006,
       "dropGroupID": [
         1006
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        1006
+      ]
     },
     {
       "ID": 1201,
       "dropGroupID": [
         1201
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        1201
+      ]
     },
     {
       "ID": 1202,
       "dropGroupID": [
         1202
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        1202
+      ]
     },
     {
       "ID": 1203,
       "dropGroupID": [
         1203
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        1203
+      ]
     },
     {
       "ID": 1204,
       "dropGroupID": [
         1204
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        1204
+      ]
     },
     {
       "ID": 1205,
       "dropGroupID": [
         1205
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        1205
+      ]
     },
     {
       "ID": 1206,
       "dropGroupID": [
         1206
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        1206
+      ]
     },
     {
       "ID": 1207,
       "dropGroupID": [
         1207
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        1207
+      ]
     },
     {
       "ID": 1208,
       "dropGroupID": [
         1208
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        1208
+      ]
     },
     {
       "ID": 1209,
       "dropGroupID": [
         1209
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        1209
+      ]
     },
     {
       "ID": 1301,
       "dropGroupID": [
         1301
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        1301
+      ]
     },
     {
       "ID": 1302,
       "dropGroupID": [
         1302
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        1302
+      ]
     },
     {
       "ID": 1303,
       "dropGroupID": [
         1303
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        1303
+      ]
     },
     {
       "ID": 1304,
       "dropGroupID": [
         1304
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        1304
+      ]
     },
     {
       "ID": 1401,
       "dropGroupID": [
         1401
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        1401
+      ]
     },
     {
       "ID": 1402,
       "dropGroupID": [
         1402
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        1402
+      ]
     },
     {
       "ID": 1403,
       "dropGroupID": [
         1403
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        1403
+      ]
     },
     {
       "ID": 1404,
       "dropGroupID": [
         1404
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        1404
+      ]
     },
     {
       "ID": 1501,
       "dropGroupID": [
         1501
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        1501
+      ]
     },
     {
       "ID": 1502,
       "dropGroupID": [
         1502
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        1502
+      ]
     },
     {
       "ID": 1601,
       "dropGroupID": [
         1601
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        1601
+      ]
     },
     {
       "ID": 10001,
       "dropGroupID": [
         10001
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        10001
+      ]
     },
     {
       "ID": 10002,
       "dropGroupID": [
         10002
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        10002
+      ]
     },
     {
       "ID": 10003,
       "dropGroupID": [
         10003
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        10003
+      ]
     },
     {
       "ID": 10004,
       "dropGroupID": [
         10004
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        10004
+      ]
     },
     {
       "ID": 10005,
       "dropGroupID": [
         10005
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        10005
+      ]
     },
     {
       "ID": 10006,
       "dropGroupID": [
         10006
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        10006
+      ]
     },
     {
       "ID": 10007,
       "dropGroupID": [
         10007
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        10007
+      ]
     },
     {
       "ID": 10008,
       "dropGroupID": [
         10008
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        10008
+      ]
     },
     {
       "ID": 10009,
       "dropGroupID": [
         10009
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        10009
+      ]
     },
     {
       "ID": 10010,
       "dropGroupID": [
         10010
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        10010
+      ]
     },
     {
       "ID": 10011,
       "dropGroupID": [
         10011
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        10011
+      ]
     },
     {
       "ID": 11001,
       "dropGroupID": [
         11001
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        11001
+      ]
     },
     {
       "ID": 11002,
       "dropGroupID": [
         11002
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        11002
+      ]
     },
     {
       "ID": 11003,
       "dropGroupID": [
         11003
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        11003
+      ]
     },
     {
       "ID": 11004,
       "dropGroupID": [
         11004
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        11004
+      ]
     },
     {
       "ID": 11005,
       "dropGroupID": [
         11005
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        11005
+      ]
     },
     {
       "ID": 11006,
       "dropGroupID": [
         11006
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        11006
+      ]
     },
     {
       "ID": 11007,
       "dropGroupID": [
         11007
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        11007
+      ]
     },
     {
       "ID": 11008,
       "dropGroupID": [
         11008
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        11008
+      ]
     },
     {
       "ID": 11009,
       "dropGroupID": [
         11009
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        11009
+      ]
     },
     {
       "ID": 11010,
       "dropGroupID": [
         11010
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        11010
+      ]
     },
     {
       "ID": 11011,
       "dropGroupID": [
         11011
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        11011
+      ]
     },
     {
       "ID": 12001,
       "dropGroupID": [
         12001
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12001
+      ]
     },
     {
       "ID": 12002,
       "dropGroupID": [
         12002
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12002
+      ]
     },
     {
       "ID": 12003,
       "dropGroupID": [
         12003
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12003
+      ]
     },
     {
       "ID": 12004,
       "dropGroupID": [
         12004
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12004
+      ]
     },
     {
       "ID": 12005,
       "dropGroupID": [
         12005
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12005
+      ]
     },
     {
       "ID": 12006,
       "dropGroupID": [
         12006
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12006
+      ]
     },
     {
       "ID": 12007,
       "dropGroupID": [
         12007
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12007
+      ]
     },
     {
       "ID": 12008,
       "dropGroupID": [
         12008
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12008
+      ]
     },
     {
       "ID": 12009,
       "dropGroupID": [
         12009
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12009
+      ]
     },
     {
       "ID": 12010,
       "dropGroupID": [
         12010
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12010
+      ]
     },
     {
       "ID": 12011,
       "dropGroupID": [
         12011
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12011
+      ]
     },
     {
       "ID": 12012,
       "dropGroupID": [
         12012
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12012
+      ]
     },
     {
       "ID": 12013,
       "dropGroupID": [
         12013
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12013
+      ]
     },
     {
       "ID": 12014,
       "dropGroupID": [
         12014
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12014
+      ]
     },
     {
       "ID": 12015,
       "dropGroupID": [
         12015
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12015
+      ]
     },
     {
       "ID": 12016,
       "dropGroupID": [
         12016
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12016
+      ]
     },
     {
       "ID": 12017,
       "dropGroupID": [
         12017
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12017
+      ]
     },
     {
       "ID": 12018,
       "dropGroupID": [
         12018
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12018
+      ]
     },
     {
       "ID": 12019,
       "dropGroupID": [
         12019
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12019
+      ]
     },
     {
       "ID": 12020,
       "dropGroupID": [
         12020
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12020
+      ]
     },
     {
       "ID": 12021,
       "dropGroupID": [
         12021
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12021
+      ]
     },
     {
       "ID": 12022,
       "dropGroupID": [
         12022
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12022
+      ]
     },
     {
       "ID": 12023,
       "dropGroupID": [
         12023
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12023
+      ]
     },
     {
       "ID": 12024,
       "dropGroupID": [
         12024
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12024
+      ]
     },
     {
       "ID": 12025,
       "dropGroupID": [
         12025
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12025
+      ]
     },
     {
       "ID": 12501,
       "dropGroupID": [
         12501
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12501
+      ]
     },
     {
       "ID": 12502,
       "dropGroupID": [
         12502
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12502
+      ]
     },
     {
       "ID": 12503,
       "dropGroupID": [
         12503
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12503
+      ]
     },
     {
       "ID": 12504,
       "dropGroupID": [
         12504
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12504
+      ]
     },
     {
       "ID": 12505,
       "dropGroupID": [
         12505
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12505
+      ]
     },
     {
       "ID": 12506,
       "dropGroupID": [
         12506
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12506
+      ]
     },
     {
       "ID": 12507,
       "dropGroupID": [
         12507
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12507
+      ]
     },
     {
       "ID": 12508,
       "dropGroupID": [
         12508
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12508
+      ]
     },
     {
       "ID": 12509,
       "dropGroupID": [
         12509
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12509
+      ]
     },
     {
       "ID": 12510,
       "dropGroupID": [
         12510
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        12510
+      ]
     },
     {
       "ID": 13001,
       "dropGroupID": [
         13001
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13001
+      ]
     },
     {
       "ID": 13002,
       "dropGroupID": [
         13002
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13002
+      ]
     },
     {
       "ID": 13003,
       "dropGroupID": [
         13003
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13003
+      ]
     },
     {
       "ID": 13004,
       "dropGroupID": [
         13004
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13004
+      ]
     },
     {
       "ID": 13005,
       "dropGroupID": [
         13005
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13005
+      ]
     },
     {
       "ID": 13006,
       "dropGroupID": [
         13006
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13006
+      ]
     },
     {
       "ID": 13007,
       "dropGroupID": [
         13007
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13007
+      ]
     },
     {
       "ID": 13008,
       "dropGroupID": [
         13008
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13008
+      ]
     },
     {
       "ID": 13009,
       "dropGroupID": [
         13009
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13009
+      ]
     },
     {
       "ID": 13010,
       "dropGroupID": [
         13010
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13010
+      ]
     },
     {
       "ID": 13011,
       "dropGroupID": [
         13011
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13011
+      ]
     },
     {
       "ID": 13012,
       "dropGroupID": [
         13012
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13012
+      ]
     },
     {
       "ID": 13013,
       "dropGroupID": [
         13013
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13013
+      ]
     },
     {
       "ID": 13014,
       "dropGroupID": [
         13014
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13014
+      ]
     },
     {
       "ID": 13015,
       "dropGroupID": [
         13015
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13015
+      ]
     },
     {
       "ID": 13016,
       "dropGroupID": [
         13016
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13016
+      ]
     },
     {
       "ID": 13017,
       "dropGroupID": [
         13017
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13017
+      ]
     },
     {
       "ID": 13018,
       "dropGroupID": [
         13018
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13018
+      ]
     },
     {
       "ID": 13019,
       "dropGroupID": [
         13019
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13019
+      ]
     },
     {
       "ID": 13020,
       "dropGroupID": [
         13020
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13020
+      ]
     },
     {
       "ID": 13021,
       "dropGroupID": [
         13021
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13021
+      ]
     },
     {
       "ID": 13022,
       "dropGroupID": [
         13022
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13022
+      ]
     },
     {
       "ID": 13023,
       "dropGroupID": [
         13023
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13023
+      ]
     },
     {
       "ID": 13024,
       "dropGroupID": [
         13024
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13024
+      ]
     },
     {
       "ID": 13025,
       "dropGroupID": [
         13025
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13025
+      ]
     },
     {
       "ID": 13501,
       "dropGroupID": [
         13501
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13501
+      ]
     },
     {
       "ID": 13502,
       "dropGroupID": [
         13502
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13502
+      ]
     },
     {
       "ID": 13503,
       "dropGroupID": [
         13503
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13503
+      ]
     },
     {
       "ID": 13504,
       "dropGroupID": [
         13504
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13504
+      ]
     },
     {
       "ID": 13505,
       "dropGroupID": [
         13505
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13505
+      ]
     },
     {
       "ID": 13506,
       "dropGroupID": [
         13506
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13506
+      ]
     },
     {
       "ID": 13507,
       "dropGroupID": [
         13507
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13507
+      ]
     },
     {
       "ID": 13508,
       "dropGroupID": [
         13508
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13508
+      ]
     },
     {
       "ID": 13509,
       "dropGroupID": [
         13509
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13509
+      ]
     },
     {
       "ID": 13510,
       "dropGroupID": [
         13510
       ],
-      "dropType": 3
+      "dropType": 3,
+      "showItemId": [
+        13510
+      ]
+    },
+    {
+      "ID": 20001,
+      "dropGroupID": [
+        20001
+      ],
+      "dropType": 3,
+      "showItemId": [
+        20001
+      ]
+    },
+    {
+      "ID": 20002,
+      "dropGroupID": [
+        20002
+      ],
+      "dropType": 3,
+      "showItemId": [
+        20002
+      ]
+    },
+    {
+      "ID": 20003,
+      "dropGroupID": [
+        20003
+      ],
+      "dropType": 3,
+      "showItemId": [
+        20003
+      ]
     }
   ]
 }

Assets/Res/Config/EventConditionConfig.json

@@ -109,7 +109,7 @@
       "Operation": null,
       "ConditionType": 6,
       "ConditionPara": [
-        1002
+        20003
       ],
       "finishCount": 3,
       "RelatedEvents": [

Assets/Res/Config/EventLinkConfig.json

@@ -1251,7 +1251,7 @@
     {
       "ID": 1000401,
       "conciseEventMessage": 2110,
-      "EventConditionMessage": 2115,
+      "EventConditionMessage": 3185,
       "PreShow": null,
       "PreShowPar": null,
       "NPCID": 101,
@@ -1272,7 +1272,7 @@
     {
       "ID": 1000402,
       "conciseEventMessage": 2110,
-      "EventConditionMessage": 2115,
+      "EventConditionMessage": 3185,
       "PreShow": null,
       "PreShowPar": null,
       "NPCID": 102,
@@ -1290,7 +1290,7 @@
     {
       "ID": 1000403,
       "conciseEventMessage": 2110,
-      "EventConditionMessage": 2115,
+      "EventConditionMessage": 3185,
       "PreShow": null,
       "PreShowPar": null,
       "NPCID": 101,

Assets/Res/Config/LanguageChineseConfig.json

@@ -8458,7 +8458,7 @@
     },
     {
       "ID": 2115,
-      "txt": "击败结界兽这么想过去，就去吧..."
+      "txt": "这么想过去，就去吧..."
     },
     {
       "ID": 2116,
@@ -8714,7 +8714,7 @@
     },
     {
       "ID": 2179,
-      "txt": "终于筑基中期了，继续寻找冲虚提到的“七道心境”吧，不知鲲鹏是否会给我答案。"
+      "txt": "终于筑基后期了，继续寻找冲虚提到的“七道心境”吧，不知鲲鹏是否会给我答案。"
     },
     {
       "ID": 2180,
@@ -12735,6 +12735,10 @@
     {
       "ID": 3184,
       "txt": "灵草种子的描述"
+    },
+    {
+      "ID": 3185,
+      "txt": "击败结界兽"
     }
   ]
 }

Assets/Scripts/GameData/ExcelConfig/DropConfig.cs

@@ -33,7 +33,7 @@ public int dropType;
 
 
 		/// <summary>
-		///显示ID -99:通过工厂表决定显示
+		///显示ID 通过工厂表决定显示
 		/// </summary>
 public int[] showItemId;