diff --git a/bin/json/game_combatlevel.json b/bin/json/game_combatlevel.json index 923beb37e..4ecb22e8c 100644 --- a/bin/json/game_combatlevel.json +++ b/bin/json/game_combatlevel.json @@ -31,7 +31,7 @@ "n": 1 } ], - "debrisitemid": 11187022, + "debrisitemid": 11187021, "scenemusic": "scenemusic_leveldemo_fcamer_1_1", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_1" }, @@ -67,7 +67,7 @@ "n": 1 } ], - "debrisitemid": 11187004, + "debrisitemid": 11187003, "scenemusic": "scenemusic_leveldemo_fcamer_1_3", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_3" }, @@ -103,7 +103,7 @@ "n": 1 } ], - "debrisitemid": 11187006, + "debrisitemid": 11187005, "scenemusic": "scenemusic_leveldemo_fcamer_1_2", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_2" }, @@ -139,7 +139,7 @@ "n": 1 } ], - "debrisitemid": 11187008, + "debrisitemid": 11187007, "scenemusic": "scenemusic_leveldemo_fcamer_1_4", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_4" }, @@ -175,7 +175,7 @@ "n": 1 } ], - "debrisitemid": 11187010, + "debrisitemid": 11187009, "scenemusic": "scenemusic_leveldemo_fcamer_1_5", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_5" }, @@ -211,7 +211,7 @@ "n": 1 } ], - "debrisitemid": 11187012, + "debrisitemid": 11187011, "scenemusic": "scenemusic_leveldemo_fcamer_1_6", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_6" }, @@ -247,7 +247,7 @@ "n": 1 } ], - "debrisitemid": 11187014, + "debrisitemid": 11187013, "scenemusic": "scenemusic_leveldemo_fcamer_1_7", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_7" }, @@ -283,7 +283,7 @@ "n": 1 } ], - "debrisitemid": 11187002, + "debrisitemid": 11187001, "scenemusic": "scenemusic_leveldemo_fcamer_1_8", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_8" }, @@ -319,7 +319,7 @@ "n": 1 } ], - "debrisitemid": 11187018, + "debrisitemid": 11187003, "scenemusic": "scenemusic_leveldemo_fcamer_1_9", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_9" }, @@ -355,7 +355,7 @@ "n": 1 } ], - "debrisitemid": 11187020, + "debrisitemid": 11187019, "scenemusic": "scenemusic_leveldemo_fcamer_1_10", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_10" }, @@ -391,7 +391,7 @@ "n": 1 } ], - "debrisitemid": 11187002, + "debrisitemid": 11187001, "scenemusic": "scenemusic_leveldemo_fcamer_1_8", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_8" }, @@ -427,7 +427,7 @@ "n": 1 } ], - "debrisitemid": 11187002, + "debrisitemid": 11187001, "scenemusic": "scenemusic_leveldemo_fcamer_1_8", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_8" }, @@ -463,7 +463,7 @@ "n": 1 } ], - "debrisitemid": 11187018, + "debrisitemid": 11187003, "scenemusic": "scenemusic_leveldemo_fcamer_1_9", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_9" }, @@ -499,7 +499,7 @@ "n": 1 } ], - "debrisitemid": 11187020, + "debrisitemid": 11187019, "scenemusic": "scenemusic_leveldemo_fcamer_1_10", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_10" } diff --git a/bin/json/game_playerinfor_barrage.json b/bin/json/game_playerinfor_barrage.json index 49202dc92..1fa912745 100644 --- a/bin/json/game_playerinfor_barrage.json +++ b/bin/json/game_playerinfor_barrage.json @@ -9,7 +9,7 @@ "text": "这好像不是熊猫?" }, "time": 90, - "speed": 10080 + "speed": 10369 }, { "id": "2", @@ -20,8 +20,8 @@ "key": "playerinfor_barrage_2", "text": "看起来像个画家。" }, - "time": 223, - "speed": 7791 + "time": 281, + "speed": 7269 }, { "id": "3", @@ -32,8 +32,8 @@ "key": "playerinfor_barrage_3", "text": "为什么会觉得是熊猫啊?" }, - "time": 415, - "speed": 8397 + "time": 486, + "speed": 10212 }, { "id": "4", @@ -44,8 +44,8 @@ "key": "playerinfor_barrage_4", "text": "从石头里蹦出来的人?怎么感觉有点熟悉……" }, - "time": 575, - "speed": 9162 + "time": 654, + "speed": 7717 }, { "id": "5", @@ -56,8 +56,8 @@ "key": "playerinfor_barrage_5", "text": "你可能是听说过从石头里蹦出来的猴子。" }, - "time": 709, - "speed": 7943 + "time": 813, + "speed": 11321 }, { "id": "6", @@ -68,8 +68,8 @@ "key": "playerinfor_barrage_6", "text": "你是从石头里蹦出来的?!" }, - "time": 894, - "speed": 9842 + "time": 1011, + "speed": 10134 }, { "id": "7", @@ -80,8 +80,8 @@ "key": "playerinfor_barrage_7", "text": "不!那不是我!" }, - "time": 1098, - "speed": 11034 + "time": 1160, + "speed": 7069 }, { "id": "8", @@ -92,8 +92,8 @@ "key": "playerinfor_barrage_8", "text": "哦,传承之人……" }, - "time": 1230, - "speed": 8619 + "time": 1373, + "speed": 11470 }, { "id": "9", @@ -104,8 +104,8 @@ "key": "playerinfor_barrage_9", "text": "月光能量都汇集在他身上了!" }, - "time": 1374, - "speed": 10631 + "time": 1599, + "speed": 11857 }, { "id": "10", @@ -116,8 +116,8 @@ "key": "playerinfor_barrage_10", "text": "那应该不会爆炸吧?" }, - "time": 1569, - "speed": 7183 + "time": 1705, + "speed": 12106 }, { "id": "11", @@ -128,8 +128,8 @@ "key": "playerinfor_barrage_11", "text": "阿宝,你为什么站那么远?" }, - "time": 1774, - "speed": 12959 + "time": 1812, + "speed": 9184 }, { "id": "312", @@ -141,7 +141,7 @@ "text": "哦!那是什么?" }, "time": 90, - "speed": 11287 + "speed": 12514 }, { "id": "313", @@ -152,8 +152,8 @@ "key": "playerinfor_barrage_313", "text": "我有种被她注视的感觉……" }, - "time": 277, - "speed": 8670 + "time": 223, + "speed": 10603 }, { "id": "314", @@ -164,8 +164,8 @@ "key": "playerinfor_barrage_314", "text": "好像是一种叫做“照相”的魔法……" }, - "time": 446, - "speed": 9631 + "time": 338, + "speed": 12422 }, { "id": "315", @@ -176,8 +176,8 @@ "key": "playerinfor_barrage_315", "text": "我看这魔法不是很疼。" }, - "time": 630, - "speed": 10499 + "time": 448, + "speed": 9121 }, { "id": "316", @@ -188,8 +188,8 @@ "key": "playerinfor_barrage_316", "text": "据说它的作用是封印灵魂?" }, - "time": 762, - "speed": 9107 + "time": 566, + "speed": 11591 }, { "id": "317", @@ -200,8 +200,8 @@ "key": "playerinfor_barrage_317", "text": "月中人的传承居然这么可怕?!" }, - "time": 888, - "speed": 12822 + "time": 787, + "speed": 12602 }, { "id": "318", @@ -212,8 +212,8 @@ "key": "playerinfor_barrage_318", "text": "哦!你们真是够了!" }, - "time": 1000, - "speed": 10927 + "time": 896, + "speed": 12464 }, { "id": "319", @@ -224,8 +224,8 @@ "key": "playerinfor_barrage_319", "text": "照相不是魔法!也不能封印灵魂!" }, - "time": 1187, - "speed": 12386 + "time": 1032, + "speed": 8303 }, { "id": "320", @@ -236,8 +236,8 @@ "key": "playerinfor_barrage_320", "text": "那她是在干什么?" }, - "time": 1420, - "speed": 12063 + "time": 1133, + "speed": 10034 }, { "id": "321", @@ -248,8 +248,8 @@ "key": "playerinfor_barrage_321", "text": "……别问。" }, - "time": 1549, - "speed": 7769 + "time": 1344, + "speed": 9045 }, { "id": "322", @@ -260,8 +260,8 @@ "key": "playerinfor_barrage_322", "text": "那可以教我吗?" }, - "time": 1744, - "speed": 10521 + "time": 1582, + "speed": 8247 }, { "id": "323", @@ -272,8 +272,8 @@ "key": "playerinfor_barrage_323", "text": "我也想学。" }, - "time": 1975, - "speed": 12186 + "time": 1721, + "speed": 9506 }, { "id": "324", @@ -284,7 +284,7 @@ "key": "playerinfor_barrage_324", "text": "要不你们问问这个传承者?" }, - "time": 2170, - "speed": 10406 + "time": 1852, + "speed": 9637 } ] \ No newline at end of file diff --git a/bin/json/game_playerinfor_overview.json b/bin/json/game_playerinfor_overview.json index d2da1f6d4..ddf98c335 100644 --- a/bin/json/game_playerinfor_overview.json +++ b/bin/json/game_playerinfor_overview.json @@ -273,7 +273,7 @@ "tujing": [ 107 ], - "url": "", + "url": "character_cardshow", "tips": 10000, "resources": "", "pvpAnimator": "", @@ -297,7 +297,7 @@ "tujing": [ 107 ], - "url": "", + "url": "character_cardshow", "tips": 10000, "resources": "", "pvpAnimator": "", diff --git a/bin/json/game_puggsyisland.json b/bin/json/game_puggsyisland.json index cbe081a59..95935a99b 100644 --- a/bin/json/game_puggsyisland.json +++ b/bin/json/game_puggsyisland.json @@ -10,7 +10,7 @@ ], "unlock": { "key": "puggsy_puggsy_unlock_1", - "text": "{0}天后可航行至伯克岛" + "text": "{0}后可航行至伯克岛" }, "introduce": { "key": "puggsy_puggsy_introduce_1", @@ -34,7 +34,7 @@ ], "unlock": { "key": "puggsy_puggsy_unlock_2", - "text": "{0}天后可航行至战栗海岸" + "text": "{0}后可航行至战栗海岸" }, "introduce": { "key": "puggsy_puggsy_introduce_2", @@ -58,7 +58,7 @@ ], "unlock": { "key": "puggsy_puggsy_unlock_3", - "text": "{0}天后可航行至西西伯利亚" + "text": "{0}后可航行至西西伯利亚" }, "introduce": { "key": "puggsy_puggsy_introduce_3", @@ -82,7 +82,7 @@ ], "unlock": { "key": "puggsy_puggsy_unlock_4", - "text": "{0}天后可航行至巴尔干半岛" + "text": "{0}后可航行至巴尔干半岛" }, "introduce": { "key": "puggsy_puggsy_introduce_4", @@ -106,7 +106,7 @@ ], "unlock": { "key": "puggsy_puggsy_unlock_5", - "text": "{0}天后可航行至新加坡海峡" + "text": "{0}后可航行至新加坡海峡" }, "introduce": { "key": "puggsy_puggsy_introduce_5", @@ -130,7 +130,7 @@ ], "unlock": { "key": "puggsy_puggsy_unlock_6", - "text": "{0}天后可航行至马奇洛" + "text": "{0}后可航行至马奇洛" }, "introduce": { "key": "puggsy_puggsy_introduce_6", diff --git a/bin/json/game_puggsymake.json b/bin/json/game_puggsymake.json index 885c9447b..7d87017a7 100644 --- a/bin/json/game_puggsymake.json +++ b/bin/json/game_puggsymake.json @@ -8,7 +8,8 @@ "text": "拉胚" }, "subitem": 1, - "png": "", + "png": "cookie_1_1", + "icon": "cookieite_1_1", "value": 0 }, { @@ -20,7 +21,8 @@ "text": "拉胚" }, "subitem": 2, - "png": "", + "png": "cookie_2_1", + "icon": "cookieite_2_1", "value": 0 }, { @@ -32,7 +34,8 @@ "text": "拉胚" }, "subitem": 3, - "png": "", + "png": "cookie_3_1", + "icon": "cookieite_3_1", "value": 0 }, { @@ -44,7 +47,8 @@ "text": "拉胚" }, "subitem": 4, - "png": "", + "png": "cookie_4_1", + "icon": "cookieite_4_1", "value": 500 }, { @@ -56,7 +60,8 @@ "text": "拉胚" }, "subitem": 5, - "png": "", + "png": "cookie_5_1", + "icon": "cookieite_5_1", "value": 500 }, { @@ -68,7 +73,8 @@ "text": "拉胚" }, "subitem": 6, - "png": "", + "png": "cookie_6_1", + "icon": "cookieite_6_1", "value": 1000 }, { @@ -80,7 +86,8 @@ "text": "器刃" }, "subitem": 1, - "png": "", + "png": "cookie_1_2", + "icon": "cookieite_1_2", "value": 0 }, { @@ -92,7 +99,8 @@ "text": "器刃" }, "subitem": 2, - "png": "", + "png": "cookie_2_2", + "icon": "cookieite_2_2", "value": 0 }, { @@ -104,7 +112,8 @@ "text": "器刃" }, "subitem": 3, - "png": "", + "png": "cookie_3_2", + "icon": "cookieite_3_2", "value": 0 }, { @@ -116,7 +125,8 @@ "text": "器刃" }, "subitem": 4, - "png": "", + "png": "cookie_4_2", + "icon": "cookieite_4_2", "value": 500 }, { @@ -128,7 +138,8 @@ "text": "器刃" }, "subitem": 5, - "png": "", + "png": "cookie_5_2", + "icon": "cookieite_5_2", "value": 500 }, { @@ -140,7 +151,8 @@ "text": "器刃" }, "subitem": 6, - "png": "", + "png": "cookie_6_2", + "icon": "cookieite_6_2", "value": 1000 }, { @@ -152,7 +164,8 @@ "text": "傍身" }, "subitem": 1, - "png": "", + "png": "cookie_1_3", + "icon": "cookieite_1_3", "value": 0 }, { @@ -164,7 +177,8 @@ "text": "傍身" }, "subitem": 2, - "png": "", + "png": "cookie_2_3", + "icon": "cookieite_2_3", "value": 0 }, { @@ -176,7 +190,8 @@ "text": "傍身" }, "subitem": 3, - "png": "", + "png": "cookie_3_3", + "icon": "cookieite_3_3", "value": 0 }, { @@ -188,7 +203,8 @@ "text": "傍身" }, "subitem": 4, - "png": "", + "png": "cookie_4_3", + "icon": "cookieite_4_3", "value": 500 }, { @@ -200,7 +216,8 @@ "text": "傍身" }, "subitem": 5, - "png": "", + "png": "cookie_5_3", + "icon": "cookieite_5_3", "value": 500 }, { @@ -212,7 +229,8 @@ "text": "傍身" }, "subitem": 6, - "png": "", + "png": "cookie_6_3", + "icon": "cookieite_6_3", "value": 1000 }, { @@ -224,7 +242,8 @@ "text": "器身" }, "subitem": 1, - "png": "", + "png": "cookie_1_4", + "icon": "cookieite_1_4", "value": 0 }, { @@ -236,7 +255,8 @@ "text": "器身" }, "subitem": 2, - "png": "", + "png": "cookie_2_4", + "icon": "cookieite_2_4", "value": 0 }, { @@ -248,7 +268,8 @@ "text": "器身" }, "subitem": 3, - "png": "", + "png": "cookie_3_4", + "icon": "cookieite_3_4", "value": 0 }, { @@ -260,7 +281,8 @@ "text": "器身" }, "subitem": 4, - "png": "", + "png": "cookie_4_4", + "icon": "cookieite_4_4", "value": 500 }, { @@ -272,7 +294,8 @@ "text": "器身" }, "subitem": 5, - "png": "", + "png": "cookie_5_4", + "icon": "cookieite_5_4", "value": 500 }, { @@ -284,7 +307,8 @@ "text": "器身" }, "subitem": 6, - "png": "", + "png": "cookie_6_4", + "icon": "cookieite_6_4", "value": 1000 }, { @@ -296,7 +320,8 @@ "text": "涂装" }, "subitem": 1, - "png": "", + "png": "cookie_1_5", + "icon": "cookieite_1_5", "value": 0 }, { @@ -308,7 +333,8 @@ "text": "涂装" }, "subitem": 2, - "png": "", + "png": "cookie_2_5", + "icon": "cookieite_2_5", "value": 0 }, { @@ -320,7 +346,8 @@ "text": "涂装" }, "subitem": 3, - "png": "", + "png": "cookie_3_5", + "icon": "cookieite_3_5", "value": 0 }, { @@ -332,7 +359,8 @@ "text": "涂装" }, "subitem": 4, - "png": "", + "png": "cookie_4_5", + "icon": "cookieite_4_5", "value": 500 }, { @@ -344,7 +372,8 @@ "text": "涂装" }, "subitem": 5, - "png": "", + "png": "cookie_5_5", + "icon": "cookieite_5_5", "value": 500 }, { @@ -356,7 +385,8 @@ "text": "涂装" }, "subitem": 6, - "png": "", + "png": "cookie_6_5", + "icon": "cookieite_6_5", "value": 1000 }, { @@ -368,7 +398,8 @@ "text": "刻纹" }, "subitem": 1, - "png": "", + "png": "cookie_1_6", + "icon": "cookieite_1_6", "value": 0 }, { @@ -380,7 +411,8 @@ "text": "刻纹" }, "subitem": 2, - "png": "", + "png": "cookie_2_6", + "icon": "cookieite_2_6", "value": 0 }, { @@ -392,7 +424,8 @@ "text": "刻纹" }, "subitem": 3, - "png": "", + "png": "cookie_3_6", + "icon": "cookieite_3_6", "value": 0 }, { @@ -404,7 +437,8 @@ "text": "刻纹" }, "subitem": 4, - "png": "", + "png": "cookie_4_6", + "icon": "cookieite_4_6", "value": 500 }, { @@ -416,7 +450,8 @@ "text": "刻纹" }, "subitem": 5, - "png": "", + "png": "cookie_5_6", + "icon": "cookieite_5_6", "value": 500 }, { @@ -428,7 +463,8 @@ "text": "刻纹" }, "subitem": 6, - "png": "", + "png": "cookie_6_6", + "icon": "cookieite_6_6", "value": 1000 } ] \ No newline at end of file diff --git a/bin/json/game_puggsystar.json b/bin/json/game_puggsystar.json index e68d0c6db..0774da597 100644 --- a/bin/json/game_puggsystar.json +++ b/bin/json/game_puggsystar.json @@ -13,7 +13,7 @@ "key": "puggsy_puggsy_star_condition_text_1", "text": "奖励条件:制作出{0}星以上的遗器" }, - "png": "", + "png": "cookie_1", "star": 4, "score": 4000, "fire": 1, @@ -40,7 +40,7 @@ "key": "puggsy_puggsy_star_condition_text_2", "text": "奖励条件:制作出{0}星以上的遗器" }, - "png": "", + "png": "cookie_2", "star": 4, "score": 4000, "fire": 2, @@ -67,7 +67,7 @@ "key": "puggsy_puggsy_star_condition_text_3", "text": "奖励条件:制作出{0}星以上的遗器" }, - "png": "", + "png": "cookie_3", "star": 4, "score": 4000, "fire": 3, @@ -94,7 +94,7 @@ "key": "puggsy_puggsy_star_condition_text_4", "text": "奖励条件:制作出{0}星以上的遗器" }, - "png": "", + "png": "cookie_4", "star": 4, "score": 4000, "fire": 1, @@ -121,7 +121,7 @@ "key": "puggsy_puggsy_star_condition_text_5", "text": "奖励条件:制作出{0}星以上的遗器" }, - "png": "", + "png": "cookie_5", "star": 5, "score": 5000, "fire": 2, @@ -148,7 +148,7 @@ "key": "puggsy_puggsy_star_condition_text_6", "text": "奖励条件:制作出{0}星以上的遗器" }, - "png": "", + "png": "cookie_6", "star": 5, "score": 5000, "fire": 3, diff --git a/modules/combat/api_ask.go b/modules/combat/api_ask.go index 80a835538..aee5634c7 100644 --- a/modules/combat/api_ask.go +++ b/modules/combat/api_ask.go @@ -49,8 +49,9 @@ func (this *apiComp) Ask(session comm.IUserSession, req *pb.CombatAskReq) (errda if level, ok = info.Level[req.Level]; !ok { err = fmt.Errorf("没有初始化指定关卡数据:%d", req.Level) errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ReqParameterError, - Title: pb.ErrorCode_ReqParameterError.ToString(), + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: err.Error(), } this.module.Errorln(err) return diff --git a/sys/configure/structs/Game.PuggsyMakeData.go b/sys/configure/structs/Game.PuggsyMakeData.go index 978d98aee..fc227c486 100644 --- a/sys/configure/structs/Game.PuggsyMakeData.go +++ b/sys/configure/structs/Game.PuggsyMakeData.go @@ -17,6 +17,7 @@ type GamePuggsyMakeData struct { MakeText string Subitem int32 Png string + Icon string Value int32 } @@ -33,6 +34,7 @@ func (_v *GamePuggsyMakeData)Deserialize(_buf map[string]interface{}) (err error {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["make_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.MakeText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.MakeText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["subitem"].(float64); !_ok_ { err = errors.New("subitem error"); return }; _v.Subitem = int32(_tempNum_) } { var _ok_ bool; if _v.Png, _ok_ = _buf["png"].(string); !_ok_ { err = errors.New("png 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["value"].(float64); !_ok_ { err = errors.New("value error"); return }; _v.Value = int32(_tempNum_) } return }