diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json
index bdc14c0dc..aa567f14a 100644
--- a/bin/json/game_buriedcondi.json
+++ b/bin/json/game_buriedcondi.json
@@ -17233,9 +17233,9 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_737",
-      "text": "定制1件装备"
+      "text": "打造1件装备"
     },
-    "type": 189,
+    "type": 148,
     "valid": 1,
     "NPC": 10144,
     "value": 1,
diff --git a/bin/json/game_global.json b/bin/json/game_global.json
index 254b8a723..bf992c5eb 100644
--- a/bin/json/game_global.json
+++ b/bin/json/game_global.json
@@ -379,58 +379,48 @@
     "MonthlyCard_DaysSent": 30,
     "opennewguide": 0,
     "library_StoryUnlocking": 3,
-    "ps_recovery": 300,
+    "ps_recovery": 360,
     "ps_ul": 2000,
     "ps_buy": [
       {
         "a": "attr",
-        "t": "gold",
+        "t": "diamond",
+        "n": 100
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 200
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 400
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 600
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 800
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
         "n": 1000
       },
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "diamond",
+        "n": 1200
       },
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 1000
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 1000
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 1000
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 1000
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 1000
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 1000
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "diamond",
+        "n": 1400
       }
     ],
     "ps_item": {
@@ -741,6 +731,7 @@
     "buzkashi_goal": 2000,
     "buzkashi_goalspeed": 800,
     "buzkashi_bumpdis": 5,
-    "stamina_potion": 10000003
+    "stamina_potion": 10000003,
+    "fight_ps": 3
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_playerlv.json b/bin/json/game_playerlv.json
index a011a7c5e..f1eaf7b90 100644
--- a/bin/json/game_playerlv.json
+++ b/bin/json/game_playerlv.json
@@ -3,774 +3,774 @@
     "lv": 1,
     "exp": 0,
     "reward": [],
-    "ps_ceiling": 60,
+    "ps_ceiling": 120,
     "cops_ps_ceiling": 60
   },
   {
     "lv": 2,
-    "exp": 500,
+    "exp": 30,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 62,
+    "ps_ceiling": 121,
     "cops_ps_ceiling": 62
   },
   {
     "lv": 3,
-    "exp": 625,
+    "exp": 45,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 64,
+    "ps_ceiling": 122,
     "cops_ps_ceiling": 64
   },
   {
     "lv": 4,
-    "exp": 781,
+    "exp": 60,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 66,
+    "ps_ceiling": 123,
     "cops_ps_ceiling": 66
   },
   {
     "lv": 5,
-    "exp": 976,
+    "exp": 90,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 68,
+    "ps_ceiling": 124,
     "cops_ps_ceiling": 68
   },
   {
     "lv": 6,
-    "exp": 1220,
+    "exp": 120,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 70,
+    "ps_ceiling": 125,
     "cops_ps_ceiling": 70
   },
   {
     "lv": 7,
-    "exp": 1525,
+    "exp": 150,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 72,
+    "ps_ceiling": 126,
     "cops_ps_ceiling": 72
   },
   {
     "lv": 8,
-    "exp": 1906,
+    "exp": 180,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 74,
+    "ps_ceiling": 127,
     "cops_ps_ceiling": 74
   },
   {
     "lv": 9,
-    "exp": 2382,
+    "exp": 210,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 76,
+    "ps_ceiling": 128,
     "cops_ps_ceiling": 76
   },
   {
     "lv": 10,
-    "exp": 2977,
+    "exp": 240,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 78,
+    "ps_ceiling": 129,
     "cops_ps_ceiling": 78
   },
   {
     "lv": 11,
-    "exp": 3721,
+    "exp": 270,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 80,
+    "ps_ceiling": 130,
     "cops_ps_ceiling": 80
   },
   {
     "lv": 12,
-    "exp": 4651,
+    "exp": 300,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 82,
+    "ps_ceiling": 131,
     "cops_ps_ceiling": 82
   },
   {
     "lv": 13,
-    "exp": 5813,
+    "exp": 330,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 84,
+    "ps_ceiling": 132,
     "cops_ps_ceiling": 84
   },
   {
     "lv": 14,
-    "exp": 7266,
+    "exp": 360,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 86,
+    "ps_ceiling": 133,
     "cops_ps_ceiling": 86
   },
   {
     "lv": 15,
-    "exp": 9082,
+    "exp": 390,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 88,
+    "ps_ceiling": 134,
     "cops_ps_ceiling": 88
   },
   {
     "lv": 16,
-    "exp": 11352,
+    "exp": 420,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 90,
+    "ps_ceiling": 135,
     "cops_ps_ceiling": 90
   },
   {
     "lv": 17,
-    "exp": 14190,
+    "exp": 450,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 92,
+    "ps_ceiling": 136,
     "cops_ps_ceiling": 92
   },
   {
     "lv": 18,
-    "exp": 17737,
+    "exp": 510,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 94,
+    "ps_ceiling": 137,
     "cops_ps_ceiling": 94
   },
   {
     "lv": 19,
-    "exp": 22171,
+    "exp": 570,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 96,
+    "ps_ceiling": 138,
     "cops_ps_ceiling": 96
   },
   {
     "lv": 20,
-    "exp": 27713,
+    "exp": 630,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 98,
+    "ps_ceiling": 139,
     "cops_ps_ceiling": 98
   },
   {
     "lv": 21,
-    "exp": 34641,
+    "exp": 690,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 100,
+    "ps_ceiling": 140,
     "cops_ps_ceiling": 100
   },
   {
     "lv": 22,
-    "exp": 43301,
+    "exp": 750,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 102,
+    "ps_ceiling": 141,
     "cops_ps_ceiling": 102
   },
   {
     "lv": 23,
-    "exp": 54126,
+    "exp": 780,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 104,
+    "ps_ceiling": 142,
     "cops_ps_ceiling": 104
   },
   {
     "lv": 24,
-    "exp": 67657,
+    "exp": 810,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 106,
+    "ps_ceiling": 143,
     "cops_ps_ceiling": 106
   },
   {
     "lv": 25,
-    "exp": 84571,
+    "exp": 840,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 108,
+    "ps_ceiling": 144,
     "cops_ps_ceiling": 108
   },
   {
     "lv": 26,
-    "exp": 105713,
+    "exp": 870,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 110,
+    "ps_ceiling": 145,
     "cops_ps_ceiling": 110
   },
   {
     "lv": 27,
-    "exp": 132141,
+    "exp": 900,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 112,
+    "ps_ceiling": 146,
     "cops_ps_ceiling": 112
   },
   {
     "lv": 28,
-    "exp": 165176,
+    "exp": 930,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 114,
+    "ps_ceiling": 147,
     "cops_ps_ceiling": 114
   },
   {
     "lv": 29,
-    "exp": 206470,
+    "exp": 960,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 116,
+    "ps_ceiling": 148,
     "cops_ps_ceiling": 116
   },
   {
     "lv": 30,
-    "exp": 258087,
+    "exp": 990,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 118,
+    "ps_ceiling": 149,
     "cops_ps_ceiling": 118
   },
   {
     "lv": 31,
-    "exp": 322608,
+    "exp": 1020,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 120,
+    "ps_ceiling": 150,
     "cops_ps_ceiling": 120
   },
   {
     "lv": 32,
-    "exp": 403260,
+    "exp": 1200,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 122,
+    "ps_ceiling": 151,
     "cops_ps_ceiling": 122
   },
   {
     "lv": 33,
-    "exp": 504075,
+    "exp": 1380,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 124,
+    "ps_ceiling": 152,
     "cops_ps_ceiling": 124
   },
   {
     "lv": 34,
-    "exp": 630093,
+    "exp": 1560,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 126,
+    "ps_ceiling": 153,
     "cops_ps_ceiling": 126
   },
   {
     "lv": 35,
-    "exp": 787616,
+    "exp": 1740,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 128,
+    "ps_ceiling": 154,
     "cops_ps_ceiling": 128
   },
   {
     "lv": 36,
-    "exp": 984520,
+    "exp": 2040,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 130,
+    "ps_ceiling": 155,
     "cops_ps_ceiling": 130
   },
   {
     "lv": 37,
-    "exp": 1230650,
+    "exp": 2340,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 132,
+    "ps_ceiling": 156,
     "cops_ps_ceiling": 132
   },
   {
     "lv": 38,
-    "exp": 1538312,
+    "exp": 2640,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 134,
+    "ps_ceiling": 157,
     "cops_ps_ceiling": 134
   },
   {
     "lv": 39,
-    "exp": 1922890,
+    "exp": 2940,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 136,
+    "ps_ceiling": 158,
     "cops_ps_ceiling": 136
   },
   {
     "lv": 40,
-    "exp": 2403612,
+    "exp": 3240,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 138,
+    "ps_ceiling": 159,
     "cops_ps_ceiling": 138
   },
   {
     "lv": 41,
-    "exp": 3004515,
+    "exp": 3540,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 140,
+    "ps_ceiling": 160,
     "cops_ps_ceiling": 140
   },
   {
     "lv": 42,
-    "exp": 3755643,
+    "exp": 3840,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 142,
+    "ps_ceiling": 162,
     "cops_ps_ceiling": 142
   },
   {
     "lv": 43,
-    "exp": 4694553,
+    "exp": 4140,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 144,
+    "ps_ceiling": 164,
     "cops_ps_ceiling": 144
   },
   {
     "lv": 44,
-    "exp": 5868191,
+    "exp": 4440,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 146,
+    "ps_ceiling": 166,
     "cops_ps_ceiling": 146
   },
   {
     "lv": 45,
-    "exp": 7335238,
+    "exp": 4740,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 148,
+    "ps_ceiling": 168,
     "cops_ps_ceiling": 148
   },
   {
     "lv": 46,
-    "exp": 9169047,
+    "exp": 5040,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 150,
+    "ps_ceiling": 170,
     "cops_ps_ceiling": 150
   },
   {
     "lv": 47,
-    "exp": 11461308,
+    "exp": 5340,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 152,
+    "ps_ceiling": 172,
     "cops_ps_ceiling": 152
   },
   {
     "lv": 48,
-    "exp": 14326635,
+    "exp": 5640,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 154,
+    "ps_ceiling": 174,
     "cops_ps_ceiling": 154
   },
   {
     "lv": 49,
-    "exp": 17908293,
+    "exp": 5940,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 156,
+    "ps_ceiling": 176,
     "cops_ps_ceiling": 156
   },
   {
     "lv": 50,
-    "exp": 22385366,
+    "exp": 6240,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 158,
+    "ps_ceiling": 180,
     "cops_ps_ceiling": 158
   },
   {
     "lv": 51,
-    "exp": 27981707,
+    "exp": 7800,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 160,
+    "ps_ceiling": 182,
     "cops_ps_ceiling": 160
   },
   {
     "lv": 52,
-    "exp": 34977133,
+    "exp": 9750,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 162,
+    "ps_ceiling": 184,
     "cops_ps_ceiling": 162
   },
   {
     "lv": 53,
-    "exp": 43721416,
+    "exp": 12187,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 164,
+    "ps_ceiling": 186,
     "cops_ps_ceiling": 164
   },
   {
     "lv": 54,
-    "exp": 54651770,
+    "exp": 15233,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 166,
+    "ps_ceiling": 188,
     "cops_ps_ceiling": 166
   },
   {
     "lv": 55,
-    "exp": 68314712,
+    "exp": 19041,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 168,
+    "ps_ceiling": 190,
     "cops_ps_ceiling": 168
   },
   {
     "lv": 56,
-    "exp": 85393390,
+    "exp": 23801,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 170,
+    "ps_ceiling": 192,
     "cops_ps_ceiling": 170
   },
   {
     "lv": 57,
-    "exp": 106741737,
+    "exp": 29751,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 172,
+    "ps_ceiling": 194,
     "cops_ps_ceiling": 172
   },
   {
     "lv": 58,
-    "exp": 133427171,
+    "exp": 37188,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 174,
+    "ps_ceiling": 196,
     "cops_ps_ceiling": 174
   },
   {
     "lv": 59,
-    "exp": 166783963,
+    "exp": 46485,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 176,
+    "ps_ceiling": 198,
     "cops_ps_ceiling": 176
   },
   {
     "lv": 60,
-    "exp": 208479953,
+    "exp": 58106,
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "ps",
+        "n": 30
       }
     ],
-    "ps_ceiling": 178,
+    "ps_ceiling": 200,
     "cops_ps_ceiling": 178
   }
 ]
\ No newline at end of file
diff --git a/modules/user/module.go b/modules/user/module.go
index b67203801..1d3a8cec6 100644
--- a/modules/user/module.go
+++ b/modules/user/module.go
@@ -524,6 +524,10 @@ func (this *User) change(session comm.IUserSession, attr string, add int32) (cha
 		}
 		change.Arenacoin += add
 	case comm.ResPs:
+		ggd := this.ModuleTools.GetGlobalConf()
+		if ggd == nil {
+			return
+		}
 		if add < 0 {
 			if user.Ps+add < 0 {
 				errdata = &pb.ErrorData{
@@ -532,11 +536,11 @@ func (this *User) change(session comm.IUserSession, attr string, add int32) (cha
 				}
 				return
 			}
+			//体力消耗，增加玩家经验
+			// exp := int32(math.Abs(float64(add))) * ggd.FightPs
+			// user.Exp += int64(exp)
 		}
-		ggd := this.ModuleTools.GetGlobalConf()
-		if ggd == nil {
-			return
-		}
+
 		if change.Ps+add > ggd.PsUl {
 			errdata = &pb.ErrorData{
 				Code:  pb.ErrorCode_UserVitLimit,
diff --git a/modules/worldtask/api_accept.go b/modules/worldtask/api_accept.go
index 2857f3ad9..7c7bf4047 100644
--- a/modules/worldtask/api_accept.go
+++ b/modules/worldtask/api_accept.go
@@ -101,26 +101,25 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
 				break
 			}
 		}
-	} 
-	// else {
-	// 	tasks = &pb.Worldtasks{
-	// 		TaskMap: make(map[int32]*pb.Worldtask),
-	// 	}
-	// 	task := &pb.Worldtask{
-	// 		TaskId:    req.TaskId,
-	// 		TaskType:  curTaskConf.Des,
-	// 		NpcStatus: 1, //接取
-	// 	}
+	} else {
+		tasks = &pb.Worldtasks{
+			TaskMap: make(map[int32]*pb.Worldtask),
+		}
+		task := &pb.Worldtask{
+			TaskId:    req.TaskId,
+			TaskType:  curTaskConf.Des,
+			NpcStatus: 1, //接取
+		}
 
-	// 	for _, cid := range curTaskConf.Completetask {
-	// 		task.Conds = append(task.Conds, &pb.ConIProgress{
-	// 			Conid: cid,
-	// 		})
-	// 	}
+		for _, cid := range curTaskConf.Completetask {
+			task.Conds = append(task.Conds, &pb.ConIProgress{
+				Conid: cid,
+			})
+		}
 
-	// 	tasks.TaskMap[req.TaskId] = task
-	// 	myWorldtask.CurrentTasks[curTaskConf.Group] = tasks
-	// }
+		tasks.TaskMap[req.TaskId] = task
+		myWorldtask.CurrentTasks[curTaskConf.Group] = tasks
+	}
 
 	update := map[string]interface{}{
 		"currentTasks": myWorldtask.CurrentTasks,
diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go
index 3b646e7c5..753a1cd8c 100644
--- a/sys/configure/structs/game.globalData.go
+++ b/sys/configure/structs/game.globalData.go
@@ -234,6 +234,7 @@ type GameGlobalData struct {
     BuzkashiGoalspeed int32
     BuzkashiBumpdis float32
     StaminaPotion int32
+    FightPs int32
 }
 
 const TypeId_GameGlobalData = 477542761
@@ -947,6 +948,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_goalspeed"].(float64); !_ok_ { err = errors.New("buzkashi_goalspeed error"); return }; _v.BuzkashiGoalspeed = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_bumpdis"].(float64); !_ok_ { err = errors.New("buzkashi_bumpdis error"); return }; _v.BuzkashiBumpdis = float32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["stamina_potion"].(float64); !_ok_ { err = errors.New("stamina_potion error"); return }; _v.StaminaPotion = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["fight_ps"].(float64); !_ok_ { err = errors.New("fight_ps error"); return }; _v.FightPs = int32(_tempNum_) }
     return
 }