From 7c973ad1aab6d2bf0ad8bb500ad628bffbd89c3b Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Wed, 15 Mar 2023 16:39:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_pagoda.json | 5 ++ bin/json/game_pandamasjx.json | 56 +++++++++++++++---- bin/json/game_pandamasmryl.json | 12 ++++ bin/json/game_pandamasmz.json | 6 +- bin/json/game_pandamastj.json | 37 ++++++++++++ sys/configure/structs/Game.PandamasJxData.go | 2 + .../structs/Game.PandamasMrylData.go | 2 + sys/configure/structs/Game.PandamasTjData.go | 2 + 8 files changed, 107 insertions(+), 15 deletions(-) diff --git a/bin/json/game_pagoda.json b/bin/json/game_pagoda.json index 4c992eaac..d916ff412 100644 --- a/bin/json/game_pagoda.json +++ b/bin/json/game_pagoda.json @@ -309,6 +309,11 @@ "a": "attr", "t": "diamond", "n": 50 + }, + { + "a": "panda", + "t": "10006", + "n": 1 } ], "exp": 600, diff --git a/bin/json/game_pandamasjx.json b/bin/json/game_pandamasjx.json index 699262ce0..b322b152f 100644 --- a/bin/json/game_pandamasjx.json +++ b/bin/json/game_pandamasjx.json @@ -7,7 +7,8 @@ "color": 3, "effects": "", "access": 0, - "img": "", + "heroid": "13002", + "img": "sbkp_js_13002", "ico": "", "intr": "食人鱼", "description": { @@ -29,7 +30,8 @@ "color": 3, "effects": "", "access": 0, - "img": "", + "heroid": "13001", + "img": "sbkp_js_13001", "ico": "", "intr": "闪闪", "description": { @@ -51,7 +53,8 @@ "color": 4, "effects": "", "access": 0, - "img": "", + "heroid": "44002", + "img": "sbkp_js_44002", "ico": "", "intr": "蛇先生", "description": { @@ -73,7 +76,8 @@ "color": 4, "effects": "", "access": 0, - "img": "", + "heroid": "24005", + "img": "sbkp_js_24005", "ico": "", "intr": "金猴", "description": { @@ -106,7 +110,8 @@ "color": 4, "effects": "", "access": 0, - "img": "", + "heroid": "14005", + "img": "sbkp_js_14005", "ico": "", "intr": "鹤大师", "description": { @@ -128,7 +133,8 @@ "color": 4, "effects": "", "access": 0, - "img": "", + "heroid": "44006", + "img": "sbkp_js_44006", "ico": "", "intr": "悍娇虎", "description": { @@ -150,7 +156,8 @@ "color": 5, "effects": "", "access": 0, - "img": "", + "heroid": "43001", + "img": "sbkp_js_43001", "ico": "", "intr": "盖", "description": { @@ -172,7 +179,8 @@ "color": 5, "effects": "", "access": 0, - "img": "", + "heroid": "35002", + "img": "sbkp_js_35002", "ico": "", "intr": "希卡普", "description": { @@ -194,7 +202,8 @@ "color": 5, "effects": "", "access": 0, - "img": "", + "heroid": "45004", + "img": "sbkp_js_45004", "ico": "", "intr": "穿靴猫", "description": { @@ -227,7 +236,8 @@ "color": 5, "effects": "", "access": 0, - "img": "", + "heroid": "35001", + "img": "sbkp_js_35001", "ico": "", "intr": "师父", "description": { @@ -260,7 +270,8 @@ "color": 5, "effects": "", "access": 0, - "img": "", + "heroid": "25001", + "img": "sbkp_js_25001", "ico": "", "intr": "阿宝", "description": { @@ -293,7 +304,8 @@ "color": 5, "effects": "", "access": 0, - "img": "", + "heroid": "45001", + "img": "sbkp_js_45001", "ico": "", "intr": "乌龟大师", "description": { @@ -326,6 +338,7 @@ "color": 3, "effects": "", "access": 0, + "heroid": "", "img": "", "ico": "", "intr": "石锁", @@ -359,6 +372,7 @@ "color": 3, "effects": "", "access": 0, + "heroid": "", "img": "", "ico": "", "intr": "双头空竹", @@ -381,6 +395,7 @@ "color": 3, "effects": "", "access": 0, + "heroid": "", "img": "", "ico": "", "intr": "木爬架", @@ -403,6 +418,7 @@ "color": 3, "effects": "", "access": 0, + "heroid": "", "img": "", "ico": "", "intr": "不倒翁", @@ -425,6 +441,7 @@ "color": 4, "effects": "", "access": 0, + "heroid": "", "img": "", "ico": "", "intr": "棒槌", @@ -447,6 +464,7 @@ "color": 4, "effects": "", "access": 0, + "heroid": "", "img": "", "ico": "", "intr": "铜铃", @@ -469,6 +487,7 @@ "color": 4, "effects": "", "access": 0, + "heroid": "", "img": "", "ico": "", "intr": "尖刺吊环", @@ -491,6 +510,7 @@ "color": 4, "effects": "", "access": 0, + "heroid": "", "img": "", "ico": "", "intr": "陀螺", @@ -513,6 +533,7 @@ "color": 4, "effects": "", "access": 0, + "heroid": "", "img": "", "ico": "", "intr": "大转轮", @@ -546,6 +567,7 @@ "color": 4, "effects": "", "access": 0, + "heroid": "", "img": "", "ico": "", "intr": "木头牌", @@ -579,6 +601,7 @@ "color": 4, "effects": "", "access": 0, + "heroid": "", "img": "", "ico": "", "intr": "双节棍", @@ -612,6 +635,7 @@ "color": 4, "effects": "", "access": 0, + "heroid": "", "img": "", "ico": "", "intr": "练功带", @@ -645,6 +669,7 @@ "color": 4, "effects": "", "access": 0, + "heroid": "", "img": "", "ico": "", "intr": "七彩花棍", @@ -678,6 +703,7 @@ "color": 4, "effects": "", "access": 0, + "heroid": "", "img": "", "ico": "", "intr": "流星飞镖", @@ -700,6 +726,7 @@ "color": 5, "effects": "", "access": 0, + "heroid": "", "img": "", "ico": "", "intr": "冥想锣", @@ -722,6 +749,7 @@ "color": 5, "effects": "", "access": 0, + "heroid": "", "img": "", "ico": "", "intr": "彩条龙", @@ -744,6 +772,7 @@ "color": 5, "effects": "", "access": 0, + "heroid": "", "img": "", "ico": "", "intr": "孔雀毛扇", @@ -775,6 +804,7 @@ "color": 5, "effects": "", "access": 0, + "heroid": "", "img": "", "ico": "", "intr": "平衡木", @@ -806,6 +836,7 @@ "color": 5, "effects": "", "access": 0, + "heroid": "", "img": "", "ico": "", "intr": "铁环", @@ -837,6 +868,7 @@ "color": 5, "effects": "", "access": 0, + "heroid": "", "img": "", "ico": "", "intr": "太极球", diff --git a/bin/json/game_pandamasmryl.json b/bin/json/game_pandamasmryl.json index 7f7a300a4..5a4bdb927 100644 --- a/bin/json/game_pandamasmryl.json +++ b/bin/json/game_pandamasmryl.json @@ -10,6 +10,7 @@ "key": "wuguandongzuo_", "text": "开合跳" }, + "ticks": 3, "p": 200, "buff_group": 1000001 }, @@ -24,6 +25,7 @@ "key": "wuguandongzuo_", "text": "手臂环绕" }, + "ticks": 3, "p": 200, "buff_group": 1000001 }, @@ -38,6 +40,7 @@ "key": "wuguandongzuo_", "text": "肩部拉伸" }, + "ticks": 3, "p": 200, "buff_group": 1000001 }, @@ -52,6 +55,7 @@ "key": "wuguandongzuo_", "text": "波比" }, + "ticks": 3, "p": 200, "buff_group": 1000001 }, @@ -66,6 +70,7 @@ "key": "wuguandongzuo_", "text": "交错俯卧撑" }, + "ticks": 3, "p": 200, "buff_group": 1000001 }, @@ -80,6 +85,7 @@ "key": "wuguandongzuo_", "text": "钻石俯卧撑" }, + "ticks": 3, "p": 200, "buff_group": 1000001 }, @@ -94,6 +100,7 @@ "key": "wuguandongzuo_", "text": "掌上压后转身" }, + "ticks": 3, "p": 200, "buff_group": 1000001 }, @@ -108,6 +115,7 @@ "key": "wuguandongzuo_", "text": "眼镜蛇式拉伸" }, + "ticks": 3, "p": 200, "buff_group": 1000001 }, @@ -122,6 +130,7 @@ "key": "wuguandongzuo_", "text": "胸部拉伸" }, + "ticks": 3, "p": 200, "buff_group": 1000001 }, @@ -136,6 +145,7 @@ "key": "wuguandongzuo_", "text": "原地跑" }, + "ticks": 3, "p": 200, "buff_group": 1000001 }, @@ -150,6 +160,7 @@ "key": "wuguandongzuo_", "text": "深蹲" }, + "ticks": 3, "p": 200, "buff_group": 1000001 }, @@ -164,6 +175,7 @@ "key": "wuguandongzuo_", "text": "仰卧起坐" }, + "ticks": 3, "p": 200, "buff_group": 1000001 } diff --git a/bin/json/game_pandamasmz.json b/bin/json/game_pandamasmz.json index 0de07e594..2f4097148 100644 --- a/bin/json/game_pandamasmz.json +++ b/bin/json/game_pandamasmz.json @@ -71,7 +71,7 @@ "key": "muzhuang_3", "text": "3级木人桩" }, - "pile_appearance": "Level3", + "pile_appearance": "Level2", "effect": { "key": "muzhuang_xiaoguo_3", "text": "每分钟提升经验{0}" @@ -104,7 +104,7 @@ "key": "muzhuang_4", "text": "4级木人桩" }, - "pile_appearance": "Level4", + "pile_appearance": "Level2", "effect": { "key": "muzhuang_xiaoguo_4", "text": "每分钟提升经验{0}" @@ -137,7 +137,7 @@ "key": "muzhuang_5", "text": "5级木人桩" }, - "pile_appearance": "Level5", + "pile_appearance": "Level2", "effect": { "key": "muzhuang_xiaoguo_5", "text": "每分钟提升经验{0}" diff --git a/bin/json/game_pandamastj.json b/bin/json/game_pandamastj.json index bb7f71be3..dfefc2aa1 100644 --- a/bin/json/game_pandamastj.json +++ b/bin/json/game_pandamastj.json @@ -14,6 +14,7 @@ "key": "wuguan_1", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 30 }, { @@ -31,6 +32,7 @@ "key": "wuguan_1", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 45 }, { @@ -48,6 +50,7 @@ "key": "wuguan_1", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 60 }, { @@ -65,6 +68,7 @@ "key": "wuguan_1", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 75 }, { @@ -82,6 +86,7 @@ "key": "wuguan_1", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 90 }, { @@ -99,6 +104,7 @@ "key": "wuguan_2", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 105 }, { @@ -116,6 +122,7 @@ "key": "wuguan_2", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 120 }, { @@ -133,6 +140,7 @@ "key": "wuguan_2", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 135 }, { @@ -150,6 +158,7 @@ "key": "wuguan_2", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 150 }, { @@ -167,6 +176,7 @@ "key": "wuguan_2", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 165 }, { @@ -184,6 +194,7 @@ "key": "wuguan_2", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 180 }, { @@ -201,6 +212,7 @@ "key": "wuguan_2", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 195 }, { @@ -218,6 +230,7 @@ "key": "wuguan_2", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 210 }, { @@ -235,6 +248,7 @@ "key": "wuguan_2", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 225 }, { @@ -252,6 +266,7 @@ "key": "wuguan_2", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 240 }, { @@ -269,6 +284,7 @@ "key": "wuguan_2", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 255 }, { @@ -286,6 +302,7 @@ "key": "wuguan_2", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 270 }, { @@ -303,6 +320,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 285 }, { @@ -320,6 +338,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 300 }, { @@ -337,6 +356,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 315 }, { @@ -354,6 +374,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 330 }, { @@ -371,6 +392,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 345 }, { @@ -388,6 +410,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 360 }, { @@ -405,6 +428,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 375 }, { @@ -422,6 +446,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 390 }, { @@ -439,6 +464,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 405 }, { @@ -456,6 +482,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 420 }, { @@ -473,6 +500,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 435 }, { @@ -490,6 +518,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 450 }, { @@ -507,6 +536,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 465 }, { @@ -524,6 +554,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 480 }, { @@ -541,6 +572,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 495 }, { @@ -558,6 +590,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 510 }, { @@ -575,6 +608,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 525 }, { @@ -592,6 +626,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 540 }, { @@ -609,6 +644,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 555 }, { @@ -626,6 +662,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, + "icon": "", "atlas_score": 570 } ] \ No newline at end of file diff --git a/sys/configure/structs/Game.PandamasJxData.go b/sys/configure/structs/Game.PandamasJxData.go index 82c7d1644..217b4182e 100644 --- a/sys/configure/structs/Game.PandamasJxData.go +++ b/sys/configure/structs/Game.PandamasJxData.go @@ -18,6 +18,7 @@ type GamePandamasJxData struct { Color int32 Effects string Access int32 + Heroid string Img string Ico string Intr string @@ -44,6 +45,7 @@ func (_v *GamePandamasJxData)Deserialize(_buf map[string]interface{}) (err error { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["color"].(float64); !_ok_ { err = errors.New("color error"); return }; _v.Color = int32(_tempNum_) } { var _ok_ bool; if _v.Effects, _ok_ = _buf["effects"].(string); !_ok_ { err = errors.New("effects error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["access"].(float64); !_ok_ { err = errors.New("access error"); return }; _v.Access = int32(_tempNum_) } + { var _ok_ bool; if _v.Heroid, _ok_ = _buf["heroid"].(string); !_ok_ { err = errors.New("heroid error"); return } } { var _ok_ bool; if _v.Img, _ok_ = _buf["img"].(string); !_ok_ { err = errors.New("img error"); return } } { var _ok_ bool; if _v.Ico, _ok_ = _buf["ico"].(string); !_ok_ { err = errors.New("ico error"); return } } { var _ok_ bool; if _v.Intr, _ok_ = _buf["intr"].(string); !_ok_ { err = errors.New("intr error"); return } } diff --git a/sys/configure/structs/Game.PandamasMrylData.go b/sys/configure/structs/Game.PandamasMrylData.go index 235e1d427..b4b009e00 100644 --- a/sys/configure/structs/Game.PandamasMrylData.go +++ b/sys/configure/structs/Game.PandamasMrylData.go @@ -15,6 +15,7 @@ type GamePandamasMrylData struct { Name string Icon string Des string + Ticks int32 P int32 BuffGroup int32 } @@ -30,6 +31,7 @@ func (_v *GamePandamasMrylData)Deserialize(_buf map[string]interface{}) (err err {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; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["des"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Des error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Des, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ticks"].(float64); !_ok_ { err = errors.New("ticks error"); return }; _v.Ticks = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["p"].(float64); !_ok_ { err = errors.New("p error"); return }; _v.P = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buff_group"].(float64); !_ok_ { err = errors.New("buff_group error"); return }; _v.BuffGroup = int32(_tempNum_) } return diff --git a/sys/configure/structs/Game.PandamasTjData.go b/sys/configure/structs/Game.PandamasTjData.go index 39894aaaf..26359cf49 100644 --- a/sys/configure/structs/Game.PandamasTjData.go +++ b/sys/configure/structs/Game.PandamasTjData.go @@ -16,6 +16,7 @@ type GamePandamasTjData struct { NameText string EffectText string ContentText string + Icon string AtlasScore int32 } @@ -31,6 +32,7 @@ func (_v *GamePandamasTjData)Deserialize(_buf map[string]interface{}) (err error {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.NameText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.NameText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["effect_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.EffectText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.EffectText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["content_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ContentText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ContentText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atlas_score"].(float64); !_ok_ { err = errors.New("atlas_score error"); return }; _v.AtlasScore = int32(_tempNum_) } return }