炉子升温

bin/json/game_coin.json

@@ -170,7 +170,7 @@
   },
   {
     "key": "moongold",
-    "name": "moongold",
+    "name": "Badge of honor",
     "color": 5,
     "effects": "",
     "access": 107,

bin/json/game_global.json

@@ -547,6 +547,14 @@
     "smithy_PurchaseType": [
       50,
       50
+    ],
+    "raise_temperature": [
+      110001,
+      50
+    ],
+    "exemption_TemperatureCos": [
+      110002,
+      50
     ]
   }
 ]

bin/json/game_item.json

@@ -1723,7 +1723,7 @@
     "id": "90001",
     "name": {
       "key": "itemname_90001",
-      "text": "阿宝天赋点"
+      "text": "阿宝星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -1767,7 +1767,7 @@
     "id": "90002",
     "name": {
       "key": "itemname_90002",
-      "text": "波比天赋点"
+      "text": "波比星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -1811,7 +1811,7 @@
     "id": "90003",
     "name": {
       "key": "itemname_90003",
-      "text": "小伊天赋点"
+      "text": "小伊星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -3126,8 +3126,8 @@
   {
     "id": "513001",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_513001",
-      "text": "闪闪天赋点"
+      "text": "闪闪星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -3170,8 +3170,8 @@
   {
     "id": "513002",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_513002",
-      "text": "食人鱼先生天赋点"
+      "text": "食人鱼先生星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -3214,8 +3214,8 @@
   {
     "id": "513003",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_513003",
-      "text": "啊啊天赋点"
+      "text": "啊啊星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -3258,8 +3258,8 @@
   {
     "id": "513004",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_513004",
-      "text": "法夸德勋爵天赋点"
+      "text": "法夸德勋爵星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -3302,8 +3302,8 @@
   {
     "id": "513005",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_513005",
-      "text": "大大天赋点"
+      "text": "大大星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -3346,8 +3346,8 @@
   {
     "id": "514001",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_514001",
-      "text": "史图依克天赋点"
+      "text": "史图依克星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -3390,8 +3390,8 @@
   {
     "id": "514002",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_514002",
-      "text": "大龙天赋点"
+      "text": "大龙星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -3434,8 +3434,8 @@
   {
     "id": "514003",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_514003",
-      "text": "亚丝翠天赋点"
+      "text": "亚丝翠星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -3478,8 +3478,8 @@
   {
     "id": "514004",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_514004",
-      "text": "克莱尔·努涅斯天赋点"
+      "text": "克莱尔·努涅斯星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -3522,8 +3522,8 @@
   {
     "id": "514005",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_514005",
-      "text": "鹤大师天赋点"
+      "text": "鹤大师星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -3566,8 +3566,8 @@
   {
     "id": "514006",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_514006",
-      "text": "布兰奇天赋点"
+      "text": "布兰奇星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -3610,8 +3610,8 @@
   {
     "id": "514007",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_514007",
-      "text": "格里斯特王子天赋点"
+      "text": "格里斯特王子星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -3654,8 +3654,8 @@
   {
     "id": "515001",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_515001",
-      "text": "吉姆·莱克天赋点"
+      "text": "吉姆·莱克星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -3698,8 +3698,8 @@
   {
     "id": "515002",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_515002",
-      "text": "船长天赋点"
+      "text": "船长星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -3742,8 +3742,8 @@
   {
     "id": "515003",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_515003",
-      "text": "希沙窦斯天赋点"
+      "text": "希沙窦斯星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -3786,8 +3786,8 @@
   {
     "id": "515004",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_515004",
-      "text": "小欧天赋点"
+      "text": "小欧星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -3830,8 +3830,8 @@
   {
     "id": "523001",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_523001",
-      "text": "斯梅克船长天赋点"
+      "text": "斯梅克船长星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -3874,8 +3874,8 @@
   {
     "id": "523002",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_523002",
-      "text": "警卫队长天赋点"
+      "text": "警卫队长星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -3918,8 +3918,8 @@
   {
     "id": "523003",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_523003",
-      "text": "泰德·邓普顿天赋点"
+      "text": "泰德·邓普顿星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -3962,8 +3962,8 @@
   {
     "id": "523004",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_523004",
-      "text": "吉姆·普雷斯科特天赋点"
+      "text": "吉姆·普雷斯科特星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -4006,8 +4006,8 @@
   {
     "id": "524001",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_524001",
-      "text": "警长天赋点"
+      "text": "警长星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -4050,8 +4050,8 @@
   {
     "id": "524002",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_524002",
-      "text": "牙仙天赋点"
+      "text": "牙仙星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -4094,8 +4094,8 @@
   {
     "id": "524003",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_524003",
-      "text": "睡神沙人天赋点"
+      "text": "睡神沙人星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -4138,8 +4138,8 @@
   {
     "id": "524004",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_524004",
-      "text": "邦尼兔天赋点"
+      "text": "邦尼兔星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -4182,8 +4182,8 @@
   {
     "id": "524005",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_524005",
-      "text": "金猴天赋点"
+      "text": "金猴星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -4226,8 +4226,8 @@
   {
     "id": "524006",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_524006",
-      "text": "凯尔天赋点"
+      "text": "凯尔星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -4270,8 +4270,8 @@
   {
     "id": "524007",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_524007",
-      "text": "小钱天赋点"
+      "text": "小钱星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -4314,8 +4314,8 @@
   {
     "id": "524008",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_524008",
-      "text": "暴芙那特天赋点"
+      "text": "暴芙那特星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -4358,8 +4358,8 @@
   {
     "id": "524009",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_524009",
-      "text": "云朵先生天赋点"
+      "text": "云朵先生星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -4402,8 +4402,8 @@
   {
     "id": "525001",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_525001",
-      "text": "阿宝天赋点"
+      "text": "阿宝星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -4446,8 +4446,8 @@
   {
     "id": "525002",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_525002",
-      "text": "沃尔夫先生天赋点"
+      "text": "沃尔夫先生星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -4490,8 +4490,8 @@
   {
     "id": "525003",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_525003",
-      "text": "羊仙姑天赋点"
+      "text": "羊仙姑星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -4534,8 +4534,8 @@
   {
     "id": "525004",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_525004",
-      "text": "波比天赋点"
+      "text": "波比星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -4578,8 +4578,8 @@
   {
     "id": "533001",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_533001",
-      "text": "巫嘎天赋点"
+      "text": "巫嘎星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -4622,8 +4622,8 @@
   {
     "id": "533002",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_533002",
-      "text": "坦克天赋点"
+      "text": "坦克星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -4666,8 +4666,8 @@
   {
     "id": "533003",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_533003",
-      "text": "胡德先生天赋点"
+      "text": "胡德先生星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -4710,8 +4710,8 @@
   {
     "id": "533004",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_533004",
-      "text": "普鲁格兰杰天赋点"
+      "text": "普鲁格兰杰星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -4754,8 +4754,8 @@
   {
     "id": "533005",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_533005",
-      "text": "鼻涕粗天赋点"
+      "text": "鼻涕粗星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -4798,8 +4798,8 @@
   {
     "id": "533006",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_533006",
-      "text": "珍妮丝·邓普顿天赋点"
+      "text": "珍妮丝·邓普顿星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -4842,8 +4842,8 @@
   {
     "id": "534001",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_534001",
-      "text": "贫嘴驴天赋点"
+      "text": "贫嘴驴星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -4886,8 +4886,8 @@
   {
     "id": "534002",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_534002",
-      "text": "蒂姆·邓普顿天赋点"
+      "text": "蒂姆·邓普顿星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -4930,8 +4930,8 @@
   {
     "id": "534003",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_534003",
-      "text": "圣诞老人天赋点"
+      "text": "圣诞老人星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -4974,8 +4974,8 @@
   {
     "id": "534004",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_534004",
-      "text": "瓜哥天赋点"
+      "text": "瓜哥星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -5018,8 +5018,8 @@
   {
     "id": "534005",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_534005",
-      "text": "沃尔特·史翠克勒天赋点"
+      "text": "沃尔特·史翠克勒星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -5062,8 +5062,8 @@
   {
     "id": "534006",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_534006",
-      "text": "冰霜杰克天赋点"
+      "text": "冰霜杰克星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -5106,8 +5106,8 @@
   {
     "id": "534007",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_534007",
-      "text": "菲奥娜天赋点"
+      "text": "菲奥娜星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -5150,8 +5150,8 @@
   {
     "id": "534008",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_534008",
-      "text": "悍夫那特天赋点"
+      "text": "悍夫那特星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -5194,8 +5194,8 @@
   {
     "id": "535001",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_535001",
-      "text": "师父天赋点"
+      "text": "师父星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -5238,8 +5238,8 @@
   {
     "id": "535002",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_535002",
-      "text": "希卡普天赋点"
+      "text": "希卡普星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -5282,8 +5282,8 @@
   {
     "id": "535003",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_535003",
-      "text": "漆黑天赋点"
+      "text": "漆黑星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -5326,8 +5326,8 @@
   {
     "id": "535004",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_535004",
-      "text": "黛安·福克斯顿天赋点"
+      "text": "黛安·福克斯顿星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -5370,8 +5370,8 @@
   {
     "id": "535005",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_535005",
-      "text": "幸运·普雷斯科特天赋点"
+      "text": "幸运·普雷斯科特星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -5414,8 +5414,8 @@
   {
     "id": "535006",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_535006",
-      "text": "平先生天赋点"
+      "text": "平先生星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -5458,8 +5458,8 @@
   {
     "id": "543001",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_543001",
-      "text": "阿比盖尔·斯通天赋点"
+      "text": "阿比盖尔·斯通星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -5502,8 +5502,8 @@
   {
     "id": "543002",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_543002",
-      "text": "果酱教授天赋点"
+      "text": "果酱教授星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -5546,8 +5546,8 @@
   {
     "id": "543003",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_543003",
-      "text": "史蒂夫·帕丘克天赋点"
+      "text": "史蒂夫·帕丘克星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -5590,8 +5590,8 @@
   {
     "id": "543004",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_543004",
-      "text": "姜饼人天赋点"
+      "text": "姜饼人星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -5634,8 +5634,8 @@
   {
     "id": "543005",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_543005",
-      "text": "瓦希尔指挥官天赋点"
+      "text": "瓦希尔指挥官星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -5678,8 +5678,8 @@
   {
     "id": "543006",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_543006",
-      "text": "布里奇特天赋点"
+      "text": "布里奇特星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -5722,8 +5722,8 @@
   {
     "id": "543007",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_543007",
-      "text": "戈伯天赋点"
+      "text": "戈伯星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -5766,8 +5766,8 @@
   {
     "id": "544001",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_544001",
-      "text": "美肚鲨天赋点"
+      "text": "美肚鲨星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -5810,8 +5810,8 @@
   {
     "id": "544002",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_544002",
-      "text": "蛇先生天赋点"
+      "text": "蛇先生星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -5854,8 +5854,8 @@
   {
     "id": "544003",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_544003",
-      "text": "匹诺曹天赋点"
+      "text": "匹诺曹星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -5898,8 +5898,8 @@
   {
     "id": "544004",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_544004",
-      "text": "骇客蛛天赋点"
+      "text": "骇客蛛星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -5942,8 +5942,8 @@
   {
     "id": "544006",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_544006",
-      "text": "悍娇虎天赋点"
+      "text": "悍娇虎星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -5986,8 +5986,8 @@
   {
     "id": "545001",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_545001",
-      "text": "乌龟大师天赋点"
+      "text": "乌龟大师星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -6030,8 +6030,8 @@
   {
     "id": "545002",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_545002",
-      "text": "梅林天赋点"
+      "text": "梅林星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -6074,8 +6074,8 @@
   {
     "id": "545003",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_545003",
-      "text": "盖天赋点"
+      "text": "盖星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -6118,8 +6118,8 @@
   {
     "id": "545004",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_545004",
-      "text": "穿靴子的猫天赋点"
+      "text": "穿靴子的猫星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -6162,8 +6162,8 @@
   {
     "id": "544005",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_544005",
-      "text": "小伊天赋点"
+      "text": "小伊星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -6206,8 +6206,8 @@
   {
     "id": "515005",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_515005",
-      "text": "亚力克斯天赋点"
+      "text": "亚力克斯星辉"
     },
     "usetype": 3,
     "color": 5,
@@ -6250,7 +6250,7 @@
   {
     "id": "500000",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_515005",
       "text": "通用共鸣道具"
     },
     "usetype": 3,
@@ -6295,7 +6295,7 @@
     "id": "1000001",
     "name": {
       "key": "itemname_1000001",
-      "text": "天赋点宝箱"
+      "text": "星辉宝箱"
     },
     "usetype": 6,
     "color": 6,
@@ -6324,7 +6324,7 @@
     "decompose_deplete": [],
     "tipstxt": {
       "key": "itemtipstxt_1000001",
-      "text": "天赋点宝箱不足"
+      "text": "星辉宝箱不足"
     }
   },
   {
@@ -6377,11 +6377,55 @@
       "text": "体力药剂不足"
     }
   },
+  {
+    "id": "600001",
+    "name": {
+      "key": "itemdesc_515005",
+      "text": "秘传书通用技能升级"
+    },
+    "usetype": 3,
+    "color": 5,
+    "bagtype": 1,
+    "index": 99,
+    "special_type": 0,
+    "time": 0,
+    "effects": "effect_ui_wuping_2",
+    "box_id": 0,
+    "synthetize_num": 0,
+    "access": [
+      155
+    ],
+    "use_skip": 155,
+    "upper_limit": 999,
+    "uselv": 0,
+    "isani": 0,
+    "star": 0,
+    "race": 0,
+    "img": "ytx_js_25001",
+    "ico": "ytx_js_25001",
+    "intr": {
+      "key": "itemdesc_600001",
+      "text": "阿宝天赋点"
+    },
+    "sale": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1000
+      }
+    ],
+    "synthetize_deplete": [],
+    "decompose_deplete": [],
+    "tipstxt": {
+      "key": "itemtipstxt_600001",
+      "text": "阿宝的天赋点不足"
+    }
+  },
   {
     "id": "625001",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_515005",
-      "text": "阿宝碎片"
+      "text": "阿宝守护之心(专属升级)"
     },
     "usetype": 3,
     "color": 5,
@@ -6424,7 +6468,7 @@
   {
     "id": "625002",
     "name": {
-      "key": "itemname_90001",
+      "key": "itemdesc_515005",
       "text": "经验道具"
     },
     "usetype": 12,

bin/json/game_pandsmasexp.json

@@ -8,6 +8,7 @@
     },
     "ReadyID": 104,
     "difficulty": 1,
+    "Numrounds": 10,
     "BattleReadyID": 104,
     "captionrecommend": [
       25001,
@@ -86,6 +87,7 @@
     },
     "ReadyID": 104,
     "difficulty": 2,
+    "Numrounds": 10,
     "BattleReadyID": 104,
     "captionrecommend": [
       25001,
@@ -164,6 +166,7 @@
     },
     "ReadyID": 104,
     "difficulty": 3,
+    "Numrounds": 10,
     "BattleReadyID": 104,
     "captionrecommend": [
       25001,
@@ -242,6 +245,7 @@
     },
     "ReadyID": 104,
     "difficulty": 4,
+    "Numrounds": 10,
     "BattleReadyID": 104,
     "captionrecommend": [
       25001,
@@ -320,6 +324,7 @@
     },
     "ReadyID": 104,
     "difficulty": 1,
+    "Numrounds": 10,
     "BattleReadyID": 104,
     "captionrecommend": [
       25001,
@@ -398,6 +403,7 @@
     },
     "ReadyID": 104,
     "difficulty": 2,
+    "Numrounds": 10,
     "BattleReadyID": 104,
     "captionrecommend": [
       25001,
@@ -476,6 +482,7 @@
     },
     "ReadyID": 104,
     "difficulty": 3,
+    "Numrounds": 10,
     "BattleReadyID": 104,
     "captionrecommend": [
       25001,
@@ -554,6 +561,7 @@
     },
     "ReadyID": 104,
     "difficulty": 4,
+    "Numrounds": 10,
     "BattleReadyID": 104,
     "captionrecommend": [
       25001,
@@ -632,6 +640,7 @@
     },
     "ReadyID": 104,
     "difficulty": 1,
+    "Numrounds": 10,
     "BattleReadyID": 104,
     "captionrecommend": [
       25001,
@@ -710,6 +719,7 @@
     },
     "ReadyID": 104,
     "difficulty": 2,
+    "Numrounds": 10,
     "BattleReadyID": 104,
     "captionrecommend": [
       25001,
@@ -788,6 +798,7 @@
     },
     "ReadyID": 104,
     "difficulty": 3,
+    "Numrounds": 10,
     "BattleReadyID": 104,
     "captionrecommend": [
       25001,
@@ -866,6 +877,7 @@
     },
     "ReadyID": 104,
     "difficulty": 4,
+    "Numrounds": 10,
     "BattleReadyID": 104,
     "captionrecommend": [
       25001,
@@ -944,6 +956,7 @@
     },
     "ReadyID": 104,
     "difficulty": 1,
+    "Numrounds": 10,
     "BattleReadyID": 104,
     "captionrecommend": [
       25001,

modules/smithy/api_rise.go

@@ -3,6 +3,8 @@ package smithy
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
+	cfg "go_dreamfactory/sys/configure/structs"
+	"strconv"
 
 	"google.golang.org/protobuf/proto"
 )
@@ -17,7 +19,9 @@ func (this *apiComp) RiseCheck(session comm.IUserSession, req *pb.SmithyRiseReq)
 
 // 炉子升温
 func (this *apiComp) Rise(session comm.IUserSession, req *pb.SmithyRiseReq) (code pb.ErrorCode, data proto.Message) {
-	var ()
+	var (
+		cost []*cfg.Gameatn // 消耗材料
+	)
 
 	code = this.RiseCheck(session, req)
 	if code != pb.ErrorCode_Success {
@@ -28,7 +32,40 @@ func (this *apiComp) Rise(session comm.IUserSession, req *pb.SmithyRiseReq) (cod
 		code = pb.ErrorCode_DBError
 		return
 	}
+	conf := this.module.configure.GetSmithyStoveConf(stove.Lv)
+	if conf != nil {
+		cost = append(cost, &cfg.Gameatn{
+			A: "item",
+			T: req.ItemId,
+			N: req.Count,
+		})
 
+		raise := this.module.configure.GetGlobalConf().RaiseTemperature
+		if len(raise) != 2 {
+			code = pb.ErrorCode_ConfigNoFound // 配置有误 直接返回
+			return                            //
+		}
+		if req.ItemId != strconv.Itoa(int(raise[0])) {
+			code = pb.ErrorCode_ReqParameterError
+			return
+		}
+		if stove.Temperature >= conf.MaxTemperature { // 已经达到最大的温度值了
+			code = pb.ErrorCode_SmithyMaxTemperature
+			return
+		}
+
+		if stove.Temperature+req.Count*raise[0] >= conf.MaxTemperature-raise[0] {
+			code = pb.ErrorCode_SmithyMaxTemperature
+			return
+		}
+		if code = this.module.ConsumeRes(session, cost, true); code != pb.ErrorCode_Success {
+			return
+		}
+		stove.Temperature += req.Count * raise[0]
+		update := make(map[string]interface{}, 0)
+		update["temperature"] = stove.Temperature
+		this.module.modelStove.updateSmithyStove(session.GetUserId(), update)
+	}
 	session.SendMsg(string(this.module.GetType()), "rise", &pb.SmithyRiseResp{Data: stove})
 	return
 }

pb/errorcode.pb.go

@@ -320,7 +320,7 @@ const (
 	ErrorCode_SmithyNoTemperature  ErrorCode = 4102 // 炉温不够不能打造
 	ErrorCode_SmithyStoveMaxLv     ErrorCode = 4103 // 炉子达到最大等级
 	ErrorCode_SmithyCustomerLimit  ErrorCode = 4104 //顾客上限
-	ErrorCode_SmithyCustomerEquipNoEnough ErrorCode = 4105 //装备回收数量不足
+	ErrorCode_SmithyMaxTemperature ErrorCode = 4105 //炉温达上限
 )
 
 // Enum value maps for ErrorCode.
@@ -591,7 +591,7 @@ var (
 		4102:  "SmithyNoTemperature",
 		4103:  "SmithyStoveMaxLv",
 		4104:  "SmithyCustomerLimit",
-		4105:  "SmithyCustomerEquipNoEnough",
+		4105:  "SmithyMaxTemperature",
 	}
 	ErrorCode_value = map[string]int32{
 		"Success":                     0,
@@ -859,7 +859,7 @@ var (
 		"SmithyNoTemperature":         4102,
 		"SmithyStoveMaxLv":            4103,
 		"SmithyCustomerLimit":         4104,
-		"SmithyCustomerEquipNoEnough": 4105,
+		"SmithyMaxTemperature":        4105,
 	}
 )
 
@@ -894,7 +894,7 @@ var File_errorcode_proto protoreflect.FileDescriptor
 
 var file_errorcode_proto_rawDesc = []byte{
 	0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2a, 0x92, 0x30, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+	0x6f, 0x2a, 0x8b, 0x30, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
 	0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d,
 	0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x10, 0x0a, 0x12,
 	0x1b, 0x0a, 0x17, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
@@ -1277,10 +1277,9 @@ var file_errorcode_proto_rawDesc = []byte{
 	0x10, 0x86, 0x20, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f,
 	0x76, 0x65, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0x87, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6d,
 	0x69, 0x74, 0x68, 0x79, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x4c, 0x69, 0x6d, 0x69,
-	0x74, 0x10, 0x88, 0x20, 0x12, 0x20, 0x0a, 0x1b, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x75,
+	0x74, 0x10, 0x88, 0x20, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4d, 0x61,
-	0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x45, 0x71, 0x75, 0x69, 0x70, 0x4e, 0x6f, 0x45, 0x6e, 0x6f,
+	0x78, 0x54, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x10, 0x89, 0x20, 0x42,
-	0x75, 0x67, 0x68, 0x10, 0x89, 0x20, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
+	0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

sys/configure/structs/Game.pandsmasexpData.go

@@ -16,6 +16,7 @@ type GamepandsmasexpData struct {
     Name string
     ReadyID int32
     Difficulty int32
+    Numrounds int32
     BattleReadyID int32
     Captionrecommend []int32
     Firstprize []*Gameatn
@@ -41,6 +42,7 @@ func (_v *GamepandsmasexpData)Deserialize(_buf map[string]interface{}) (err erro
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ReadyID"].(float64); !_ok_ { err = errors.New("ReadyID error"); return }; _v.ReadyID = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["difficulty"].(float64); !_ok_ { err = errors.New("difficulty error"); return }; _v.Difficulty = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Numrounds"].(float64); !_ok_ { err = errors.New("Numrounds error"); return }; _v.Numrounds = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BattleReadyID"].(float64); !_ok_ { err = errors.New("BattleReadyID error"); return }; _v.BattleReadyID = int32(_tempNum_) }
      {
                 var _arr_ []interface{}

sys/configure/structs/game.globalData.go

@@ -176,6 +176,8 @@ type GameGlobalData struct {
     Moonshopmoney []int32
     Generaltp *Gameatn
     SmithyPurchaseType []int32
+    RaiseTemperature []int32
+    ExemptionTemperatureCos []int32
 }
 
 const TypeId_GameGlobalData = 477542761
@@ -753,6 +755,34 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
                 }
             }
 
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["raise_temperature"].([]interface{}); !_ok_ { err = errors.New("raise_temperature error"); return }
+
+                _v.RaiseTemperature = make([]int32, 0, len(_arr_))
+                
+                for _, _e_ := range _arr_ {
+                    var _list_v_ int32
+                    { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+                    _v.RaiseTemperature = append(_v.RaiseTemperature, _list_v_)
+                }
+            }
+
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["exemption_TemperatureCos"].([]interface{}); !_ok_ { err = errors.New("exemption_TemperatureCos error"); return }
+
+                _v.ExemptionTemperatureCos = make([]int32, 0, len(_arr_))
+                
+                for _, _e_ := range _arr_ {
+                    var _list_v_ int32
+                    { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+                    _v.ExemptionTemperatureCos = append(_v.ExemptionTemperatureCos, _list_v_)
+                }
+            }
+
     return
 }