更新配置表

gdconf/game_data_config/json/common/ConfigGlobalCombat.json

@@ -1,3 +1,4 @@
+//ServerUploadTool Save to [/root/env/data/json/common]
 {
   "gameAnimSafeType":{
     "maxCount": 20,
@@ -809,6 +810,20 @@
       ],
       "maxValue": 15,
     },
+    {
+      "tag": "Yaoyao_ElementalBurst_Rabbit",
+      "gadgetIDs": [
+        41077007,
+      ],
+      "maxValue": 5,
+    },
+    {
+      "tag": "Yaoyao_ElementalArt_Turnip",
+      "gadgetIDs": [
+        41077004,
+      ],
+      "maxValue": 5,
+    },
   ],
   "MushroomConfigIDList":[
     70900397,
@@ -1447,8 +1462,8 @@
 			},
       {
         "equipType": "Pole",
-        "putAwaySize": 0.95,
-        "takeOutSize": 0.95,
+        "putAwaySize": 0.75,
+        "takeOutSize": 0.8,
       },
 		],
 	},
@@ -1590,8 +1605,8 @@
 			},
       {
         "equipType": "Pole",
-        "putAwaySize": 1.2,
-        "takeOutSize": 1.2,
+        "putAwaySize": 0.8,
+        "takeOutSize": 0.8,
       },
 		],
 	},
@@ -2012,7 +2027,31 @@
         "denyLockOn": true,
       },
     },
-
+    "canBeSelect":
+    {
+      "property":
+      {
+        "HP": 100,
+        "attack": 0,
+        "defense": 0,
+        "isLockHP":true,
+        "isGhostToEnemy": false,
+        "isGhostToAllied": true,
+        "canTriggerBullet": false,
+      },
+      "beHit" :
+      {
+          "hitBloodEffect" : "",
+          "hitAutoRedirect": false,
+          "muteAllHit" : false,
+          "muteAllHitEffect" : false,
+          "muteAllHitText" : true,
+      },
+      "combatLock":
+      {
+        "denyLockOn": true,
+      },
+    },
     "canBeLockOn":
     {
       "property":
@@ -2135,6 +2174,12 @@
     },
     {
       "key":"COLLISION_POINT_TRIGGER_ID_2",
+    },
+    {
+      "key":"COLLISION_POINT_OTHER_ID_1",
+    },
+    {
+      "key":"COLLISION_POINT_OTHER_ID_2",
     }
   ],
   "attacktagToElementreactionDictionary":