Merge remote-tracking branch 'origin/master'

Assets/Res/Config/EventConfig.json

@@ -4817,10 +4817,12 @@
       "EventQuality": 3,
       "PrizeIDs": [
         22008,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        10000,
         3000
       ],
       "RefreshProbability": 40,
@@ -6242,6 +6244,14 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 3,
+      "PrizeIDs": [
+        1401,
+        1003
+      ],
+      "PrizeNums": [
+        1,
+        -3000
+      ],
       "RefreshProbability": 30,
       "RefreshCount": 1,
       "placeID": 1,
@@ -6271,18 +6281,24 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 3,
+      "PrizeIDs": [
+        1401,
+        1003
+      ],
+      "PrizeNums": [
+        1,
+        -3000
+      ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 1,
       "XiantuID": 0,
       "EventConditionId": [
-        10,
-        3
+        10
       ],
       "EventValue": [
-        9147,
-        20
+        9147
       ],
       "EventName": 4283,
       "Description": 4363
@@ -6303,18 +6319,24 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 3,
+      "PrizeIDs": [
+        1401,
+        1003
+      ],
+      "PrizeNums": [
+        1,
+        -3000
+      ],
       "RefreshProbability": 15,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 1,
       "XiantuID": 0,
       "EventConditionId": [
-        10,
-        3
+        10
       ],
       "EventValue": [
-        9148,
-        40
+        9148
       ],
       "EventName": 4284,
       "Description": 4364
@@ -6502,10 +6524,13 @@
       "SmallPlacesId": 0,
       "XiantuID": 0,
       "EventConditionId": [
-        10
+        1
       ],
       "EventValue": [
-        9153
+        23200
+      ],
+      "EventCount": [
+        3
       ],
       "EventName": 4289,
       "Description": 4369

Assets/Res/Config/EventLinkConfig.json

@@ -21329,11 +21329,20 @@
       ],
       "DialogueType": 0,
       "EventID": 9150,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        915004
-      ]
+      "optionType": 4,
+      "optionPara1": [
+        1401
+      ],
+      "optionPara2": [
+        1
+      ],
+      "PrizeIDs": [
+        1402
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "ResultType": 0
     },
     {
       "ID": 915004,
@@ -21348,6 +21357,12 @@
       "DialogueType": 0,
       "EventID": 9150,
       "optionType": 0,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        -1000
+      ],
       "ResultType": 0
     },
     {
@@ -21474,7 +21489,19 @@
       ],
       "DialogueType": 0,
       "EventID": 9151,
-      "optionType": 0,
+      "optionType": 4,
+      "optionPara1": [
+        1001
+      ],
+      "optionPara2": [
+        100
+      ],
+      "PrizeIDs": [
+        23200
+      ],
+      "PrizeNums": [
+        1
+      ],
       "ResultType": 0
     },
     {
@@ -21508,6 +21535,12 @@
       "DialogueType": 0,
       "EventID": 9151,
       "optionType": 0,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        100
+      ],
       "ResultType": 0
     },
     {
@@ -21587,6 +21620,12 @@
       "DialogueType": 0,
       "EventID": 9152,
       "optionType": 0,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        100
+      ],
       "ResultType": 0
     },
     {
@@ -21652,7 +21691,19 @@
       ],
       "DialogueType": 0,
       "EventID": 9152,
-      "optionType": 0,
+      "optionType": 4,
+      "optionPara1": [
+        1001
+      ],
+      "optionPara2": [
+        100
+      ],
+      "PrizeIDs": [
+        23200
+      ],
+      "PrizeNums": [
+        1
+      ],
       "ResultType": 0
     },
     {
@@ -21731,7 +21782,19 @@
       ],
       "DialogueType": 0,
       "EventID": 9153,
-      "optionType": 0,
+      "optionType": 4,
+      "optionPara1": [
+        1001
+      ],
+      "optionPara2": [
+        100
+      ],
+      "PrizeIDs": [
+        23200
+      ],
+      "PrizeNums": [
+        1
+      ],
       "ResultType": 0
     },
     {
@@ -21834,6 +21897,12 @@
       "DialogueType": 0,
       "EventID": 9153,
       "optionType": 0,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        100
+      ],
       "ResultType": 0
     },
     {
@@ -21921,6 +21990,12 @@
       "DialogueType": 0,
       "EventID": 9154,
       "optionType": 0,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        999999
+      ],
       "ResultType": 1,
       "ResultOptions": [
         915406

Assets/Res/Config/ItemConfig.json

@@ -5935,7 +5935,7 @@
       "itemName": 10100,
       "itemDesc": 10104,
       "icon": "icon_adcard1",
-      "itemTag": 24,
+      "itemTag": 25,
       "quality": 4,
       "stack": 0,
       "isSell": false,
@@ -5967,7 +5967,7 @@
       "itemName": 10101,
       "itemDesc": 10105,
       "icon": "icon_adcard2",
-      "itemTag": 24,
+      "itemTag": 25,
       "quality": 5,
       "stack": 0,
       "isSell": false,
@@ -5993,6 +5993,31 @@
       ],
       "sort": 0,
       "itemDesc2": 0
+    },
+    {
+      "ID": 23200,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_adcard1",
+      "itemTag": 26,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
     }
   ]
 }

Assets/Res/Config/LanguageChineseConfig.json

@@ -38562,7 +38562,7 @@
     },
     {
       "ID": 10381,
-      "txt": "圆满"
+      "txt": "期圆满"
     },
     {
       "ID": 10382,