上传配置

bin/json/game_block.json

@@ -349,7 +349,7 @@
   },
   {
     "key": 25,
-    "color": 7,
+    "color": 5,
     "excolor": 9,
     "direction": [],
     "belongto": 2,

bin/json/game_combatbox.json

@@ -85,14 +85,14 @@
   },
   {
     "id": 10401,
-    "drop": 1001
+    "drop": 16002001
   },
   {
     "id": 10402,
-    "drop": 1001
+    "drop": 16002002
   },
   {
     "id": 10403,
-    "drop": 1001
+    "drop": 16002002
   }
 ]

bin/json/game_combatlevel.json

@@ -305,13 +305,13 @@
   },
   {
     "id": 10009,
-    "scene": "leveldemo_fcamer_1_9",
+    "scene": "leveldemo_fcamer_Camelot",
     "levelname": "Save the holy tree",
     "maintask": [
-      11187017
+      11187003
     ],
     "subtask": [
-      11187018
+      11187004
     ],
     "award": [
       {

bin/json/game_consumehero.json

@@ -3,7 +3,14 @@
     "key": "27000001",
     "type": 1,
     "hero": 44004,
-    "consume": [],
+    "consume": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1000
+      }
+    ],
+    "skilltype": 1,
     "skillload": 7,
     "skilleffect": 1,
     "skillvalue": 7
@@ -19,6 +26,7 @@
         "n": 1000
       }
     ],
+    "skilltype": 2,
     "skillload": 7,
     "skilleffect": 2,
     "skillvalue": 0

bin/json/game_gamesummary.json

@@ -354,7 +354,7 @@
     },
     "type": 4,
     "params": "",
-    "jumpId": 10013,
+    "jumpId": 10017,
     "introduce": {
       "key": "gamesummary_node_introdunce_10",
       "text": "梦幻与诡异兼具，这便是沙人建造的梦境回廊。是超越自我，还是沉迷其中不愿醒来？"
@@ -383,7 +383,7 @@
     "id": 11,
     "name": {
       "key": "gamesummary_node_name_11",
-      "text": "炼金塔"
+      "text": "修炼塔"
     },
     "tabId": 7,
     "mapPos": {
@@ -421,7 +421,7 @@
     "id": 12,
     "name": {
       "key": "gamesummary_node_name_12",
-      "text": "无极塔"
+      "text": "塔岗监狱"
     },
     "tabId": 8,
     "mapPos": {
@@ -430,7 +430,7 @@
     },
     "type": 4,
     "params": "",
-    "jumpId": 10017,
+    "jumpId": 10013,
     "introduce": {
       "key": "gamesummary_node_introdunce_12",
       "text": "无穷无尽的试炼，越来越棘手的对手。这里是师傅为穷尽武道者而修建的地方。"

bin/json/game_heroupstorybattle.json

@@ -2,7 +2,7 @@
   {
     "id": 101,
     "FormatList": [
-      601001
+      101011
     ],
     "BattleReadyID": 126,
     "EventList": [],
@@ -16,7 +16,7 @@
   {
     "id": 102,
     "FormatList": [
-      601002
+      101021
     ],
     "BattleReadyID": 126,
     "EventList": [],
@@ -30,7 +30,7 @@
   {
     "id": 103,
     "FormatList": [
-      601003
+      101031
     ],
     "BattleReadyID": 126,
     "EventList": [],
@@ -44,7 +44,7 @@
   {
     "id": 104,
     "FormatList": [
-      601004
+      101041
     ],
     "BattleReadyID": 126,
     "EventList": [],
@@ -58,7 +58,7 @@
   {
     "id": 105,
     "FormatList": [
-      601005
+      101051
     ],
     "BattleReadyID": 126,
     "EventList": [],
@@ -72,7 +72,7 @@
   {
     "id": 106,
     "FormatList": [
-      601006
+      101061
     ],
     "BattleReadyID": 126,
     "EventList": [],
@@ -86,7 +86,7 @@
   {
     "id": 107,
     "FormatList": [
-      601007
+      101011
     ],
     "BattleReadyID": 126,
     "EventList": [],
@@ -100,7 +100,7 @@
   {
     "id": 108,
     "FormatList": [
-      601008
+      101021
     ],
     "BattleReadyID": 126,
     "EventList": [],
@@ -114,7 +114,7 @@
   {
     "id": 109,
     "FormatList": [
-      601009
+      101031
     ],
     "BattleReadyID": 126,
     "EventList": [],
@@ -128,7 +128,7 @@
   {
     "id": 110,
     "FormatList": [
-      601010
+      101041
     ],
     "BattleReadyID": 126,
     "EventList": [],
@@ -142,7 +142,7 @@
   {
     "id": 111,
     "FormatList": [
-      601011
+      101051
     ],
     "BattleReadyID": 126,
     "EventList": [],
@@ -156,7 +156,7 @@
   {
     "id": 112,
     "FormatList": [
-      601012
+      101061
     ],
     "BattleReadyID": 126,
     "EventList": [],
@@ -170,7 +170,7 @@
   {
     "id": 113,
     "FormatList": [
-      601013
+      101011
     ],
     "BattleReadyID": 126,
     "EventList": [],
@@ -184,7 +184,7 @@
   {
     "id": 114,
     "FormatList": [
-      601014
+      101021
     ],
     "BattleReadyID": 126,
     "EventList": [],
@@ -198,7 +198,7 @@
   {
     "id": 115,
     "FormatList": [
-      601015
+      101031
     ],
     "BattleReadyID": 126,
     "EventList": [],
@@ -212,7 +212,7 @@
   {
     "id": 116,
     "FormatList": [
-      601016
+      101041
     ],
     "BattleReadyID": 126,
     "EventList": [],
@@ -226,7 +226,7 @@
   {
     "id": 117,
     "FormatList": [
-      601017
+      101051
     ],
     "BattleReadyID": 126,
     "EventList": [],
@@ -240,7 +240,7 @@
   {
     "id": 118,
     "FormatList": [
-      601018
+      101061
     ],
     "BattleReadyID": 126,
     "EventList": [],
@@ -254,7 +254,7 @@
   {
     "id": 119,
     "FormatList": [
-      601019
+      101011
     ],
     "BattleReadyID": 126,
     "EventList": [],
@@ -268,7 +268,7 @@
   {
     "id": 120,
     "FormatList": [
-      601020
+      101021
     ],
     "BattleReadyID": 126,
     "EventList": [],

bin/json/game_linestorymaintask.json

@@ -24,7 +24,7 @@
     "group": 10001,
     "nodeIndex": 1,
     "order": "2",
-    "stageid": 10002,
+    "stageid": 10009,
     "name": {
       "key": "linestory_maintask_name_2",
       "text": "让阿宝变强2"
@@ -157,7 +157,7 @@
     "group": 10003,
     "nodeIndex": 2,
     "order": "3",
-    "stageid": 10009,
+    "stageid": 10002,
     "name": {
       "key": "linestory_maintask_name_9",
       "text": "让阿宝变强9"

bin/json/game_mainstage.json

@@ -1410,7 +1410,7 @@
     "previous_group_id": [
       1001121
     ],
-    "previoustage": 1100114,
+    "previoustage": 1101014,
     "grouptype": [],
     "Episodetype": 4,
     "stage_param": 0,
@@ -1527,7 +1527,7 @@
     "previous_group_id": [
       1001121
     ],
-    "previoustage": 1100115,
+    "previoustage": 1101015,
     "grouptype": [],
     "Episodetype": 4,
     "stage_param": 0,
@@ -3328,7 +3328,7 @@
     "previous_group_id": [
       100130
     ],
-    "previoustage": 1100136,
+    "previoustage": 1101036,
     "grouptype": [],
     "Episodetype": 4,
     "stage_param": 0,
@@ -3449,7 +3449,7 @@
     "previous_group_id": [
       100130
     ],
-    "previoustage": 1100137,
+    "previoustage": 1101037,
     "grouptype": [],
     "Episodetype": 4,
     "stage_param": 0,
@@ -3570,7 +3570,7 @@
     "previous_group_id": [
       100130
     ],
-    "previoustage": 1100138,
+    "previoustage": 1101038,
     "grouptype": [],
     "Episodetype": 4,
     "stage_param": 0,
@@ -3691,7 +3691,7 @@
     "previous_group_id": [
       100130
     ],
-    "previoustage": 1100139,
+    "previoustage": 1101039,
     "grouptype": [],
     "Episodetype": 4,
     "stage_param": 0,
@@ -3812,7 +3812,7 @@
     "previous_group_id": [
       100130
     ],
-    "previoustage": 1100140,
+    "previoustage": 1101040,
     "grouptype": [],
     "Episodetype": 4,
     "stage_param": 0,
@@ -3933,7 +3933,7 @@
     "previous_group_id": [
       100130
     ],
-    "previoustage": 1100141,
+    "previoustage": 1101041,
     "grouptype": [],
     "Episodetype": 4,
     "stage_param": 0,
@@ -4054,7 +4054,7 @@
     "previous_group_id": [
       100130
     ],
-    "previoustage": 1100142,
+    "previoustage": 1101042,
     "grouptype": [],
     "Episodetype": 4,
     "stage_param": 0,
@@ -4296,7 +4296,7 @@
     "previous_group_id": [
       100133
     ],
-    "previoustage": 1100144,
+    "previoustage": 1101044,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -4417,7 +4417,7 @@
     "previous_group_id": [
       100133
     ],
-    "previoustage": 1100145,
+    "previoustage": 1101045,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -4538,7 +4538,7 @@
     "previous_group_id": [
       100133
     ],
-    "previoustage": 1100146,
+    "previoustage": 1101046,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -4659,7 +4659,7 @@
     "previous_group_id": [
       100133
     ],
-    "previoustage": 1100147,
+    "previoustage": 1101047,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -4780,7 +4780,7 @@
     "previous_group_id": [
       100133
     ],
-    "previoustage": 1100148,
+    "previoustage": 1101048,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -4901,7 +4901,7 @@
     "previous_group_id": [
       100133
     ],
-    "previoustage": 1100149,
+    "previoustage": 1101049,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -5022,7 +5022,7 @@
     "previous_group_id": [
       100133
     ],
-    "previoustage": 1100150,
+    "previoustage": 1101050,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -5264,7 +5264,7 @@
     "previous_group_id": [
       100134
     ],
-    "previoustage": 1100152,
+    "previoustage": 1101052,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -5385,7 +5385,7 @@
     "previous_group_id": [
       100134
     ],
-    "previoustage": 1100153,
+    "previoustage": 1101053,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -5506,7 +5506,7 @@
     "previous_group_id": [
       100134
     ],
-    "previoustage": 1100154,
+    "previoustage": 1101054,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -5627,7 +5627,7 @@
     "previous_group_id": [
       100134
     ],
-    "previoustage": 1100155,
+    "previoustage": 1101055,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -5748,7 +5748,7 @@
     "previous_group_id": [
       100134
     ],
-    "previoustage": 1100156,
+    "previoustage": 1101056,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -5869,7 +5869,7 @@
     "previous_group_id": [
       100134
     ],
-    "previoustage": 1100157,
+    "previoustage": 1101057,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -5990,7 +5990,7 @@
     "previous_group_id": [
       100134
     ],
-    "previoustage": 1100158,
+    "previoustage": 1101058,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -9859,7 +9859,7 @@
     "previous_group_id": [
       100212
     ],
-    "previoustage": 1100213,
+    "previoustage": 1102013,
     "grouptype": [],
     "Episodetype": 4,
     "stage_param": 0,
@@ -9975,7 +9975,7 @@
     "previous_group_id": [
       100212
     ],
-    "previoustage": 1100214,
+    "previoustage": 1102014,
     "grouptype": [],
     "Episodetype": 4,
     "stage_param": 0,
@@ -10207,7 +10207,7 @@
     "previous_group_id": [
       100213
     ],
-    "previoustage": 1100216,
+    "previoustage": 1102016,
     "grouptype": [],
     "Episodetype": 4,
     "stage_param": 0,
@@ -10323,7 +10323,7 @@
     "previous_group_id": [
       100213
     ],
-    "previoustage": 1100217,
+    "previoustage": 1102017,
     "grouptype": [],
     "Episodetype": 4,
     "stage_param": 0,
@@ -11071,7 +11071,7 @@
     "previous_group_id": [
       100220
     ],
-    "previoustage": 1100225,
+    "previoustage": 1102025,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -11192,7 +11192,7 @@
     "previous_group_id": [
       100220
     ],
-    "previoustage": 1100226,
+    "previoustage": 1102026,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -11313,7 +11313,7 @@
     "previous_group_id": [
       100220
     ],
-    "previoustage": 1100227,
+    "previoustage": 1102027,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -11434,7 +11434,7 @@
     "previous_group_id": [
       100220
     ],
-    "previoustage": 1100228,
+    "previoustage": 1102028,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -11555,7 +11555,7 @@
     "previous_group_id": [
       100220
     ],
-    "previoustage": 1100229,
+    "previoustage": 1102029,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -11676,7 +11676,7 @@
     "previous_group_id": [
       100220
     ],
-    "previoustage": 1100230,
+    "previoustage": 1102030,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -11797,7 +11797,7 @@
     "previous_group_id": [
       100220
     ],
-    "previoustage": 1100231,
+    "previoustage": 1102031,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -12039,7 +12039,7 @@
     "previous_group_id": [
       100221
     ],
-    "previoustage": 1100233,
+    "previoustage": 1102033,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -12160,7 +12160,7 @@
     "previous_group_id": [
       100221
     ],
-    "previoustage": 1100234,
+    "previoustage": 1102034,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -12281,7 +12281,7 @@
     "previous_group_id": [
       100221
     ],
-    "previoustage": 1100235,
+    "previoustage": 1102035,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -12402,7 +12402,7 @@
     "previous_group_id": [
       100221
     ],
-    "previoustage": 1100236,
+    "previoustage": 1102036,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -12523,7 +12523,7 @@
     "previous_group_id": [
       100221
     ],
-    "previoustage": 1100237,
+    "previoustage": 1102037,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -12644,7 +12644,7 @@
     "previous_group_id": [
       100221
     ],
-    "previoustage": 1100238,
+    "previoustage": 1102038,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -12765,7 +12765,7 @@
     "previous_group_id": [
       100221
     ],
-    "previoustage": 1100239,
+    "previoustage": 1102039,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -13007,7 +13007,7 @@
     "previous_group_id": [
       100222
     ],
-    "previoustage": 1100241,
+    "previoustage": 1102041,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -13128,7 +13128,7 @@
     "previous_group_id": [
       100222
     ],
-    "previoustage": 1100242,
+    "previoustage": 1102042,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -13249,7 +13249,7 @@
     "previous_group_id": [
       100222
     ],
-    "previoustage": 1100243,
+    "previoustage": 1102043,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -13370,7 +13370,7 @@
     "previous_group_id": [
       100222
     ],
-    "previoustage": 1100244,
+    "previoustage": 1102044,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -13491,7 +13491,7 @@
     "previous_group_id": [
       100222
     ],
-    "previoustage": 1100245,
+    "previoustage": 1102045,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -13612,7 +13612,7 @@
     "previous_group_id": [
       100222
     ],
-    "previoustage": 1100246,
+    "previoustage": 1102046,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -13733,7 +13733,7 @@
     "previous_group_id": [
       100222
     ],
-    "previoustage": 1100247,
+    "previoustage": 1102047,
     "grouptype": [],
     "Episodetype": 8,
     "stage_param": 0,
@@ -14796,7 +14796,7 @@
     "previous_group_id": [
       100229
     ],
-    "previoustage": 1100259,
+    "previoustage": 1102059,
     "grouptype": [],
     "Episodetype": 4,
     "stage_param": 0,
@@ -14917,7 +14917,7 @@
     "previous_group_id": [
       100229
     ],
-    "previoustage": 1100260,
+    "previoustage": 1102060,
     "grouptype": [],
     "Episodetype": 4,
     "stage_param": 0,
@@ -15038,7 +15038,7 @@
     "previous_group_id": [
       100229
     ],
-    "previoustage": 1100261,
+    "previoustage": 1102061,
     "grouptype": [],
     "Episodetype": 4,
     "stage_param": 0,
@@ -15159,7 +15159,7 @@
     "previous_group_id": [
       100229
     ],
-    "previoustage": 1100262,
+    "previoustage": 1102062,
     "grouptype": [],
     "Episodetype": 4,
     "stage_param": 0,
@@ -15280,7 +15280,7 @@
     "previous_group_id": [
       100229
     ],
-    "previoustage": 1100263,
+    "previoustage": 1102063,
     "grouptype": [],
     "Episodetype": 4,
     "stage_param": 0,
@@ -15401,7 +15401,7 @@
     "previous_group_id": [
       100229
     ],
-    "previoustage": 1100264,
+    "previoustage": 1102064,
     "grouptype": [],
     "Episodetype": 4,
     "stage_param": 0,

sys/configure/structs/Game.ConsumeHeroData.go

@@ -15,6 +15,7 @@ type GameConsumeHeroData struct {
     Type int32
     Hero int32
     Consume []*Gameatn
+    Skilltype int32
     Skillload int32
     Skilleffect int32
     Skillvalue int32
@@ -44,6 +45,7 @@ func (_v *GameConsumeHeroData)Deserialize(_buf map[string]interface{}) (err erro
                 }
             }
 
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skilltype"].(float64); !_ok_ { err = errors.New("skilltype error"); return }; _v.Skilltype = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skillload"].(float64); !_ok_ { err = errors.New("skillload error"); return }; _v.Skillload = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skilleffect"].(float64); !_ok_ { err = errors.New("skilleffect error"); return }; _v.Skilleffect = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skillvalue"].(float64); !_ok_ { err = errors.New("skillvalue error"); return }; _v.Skillvalue = int32(_tempNum_) }