From 544db8a3cf23c49994ffa7aafc1f2310e44bf8a7 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Thu, 1 Jun 2023 18:53:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_heroconvertdata.json | 8 +- bin/json/game_photoaction.json | 56 +++++ bin/json/game_photofilter.json | 65 ++++++ bin/json/game_playerinfor_overview.json | 85 ++++++-- bin/json/game_skillafteratk.json | 22 +- bin/json/game_skillatk.json | 196 +++++++++--------- modules/user/api_switchdefper.go | 8 +- modules/user/comp_configure.go | 49 +++-- modules/user/module.go | 4 +- sys/configure/structs/Game.PhotoAction.go | 42 ++++ sys/configure/structs/Game.PhotoActionData.go | 41 ++++ sys/configure/structs/Game.PhotoFilter.go | 42 ++++ sys/configure/structs/Game.PhotoFilterData.go | 41 ++++ .../structs/Game.PlayerInfor_overview.go | 14 +- .../structs/Game.PlayerInfor_overviewData.go | 20 +- sys/configure/structs/Tables.go | 14 ++ 16 files changed, 532 insertions(+), 175 deletions(-) create mode 100644 bin/json/game_photoaction.json create mode 100644 bin/json/game_photofilter.json create mode 100644 sys/configure/structs/Game.PhotoAction.go create mode 100644 sys/configure/structs/Game.PhotoActionData.go create mode 100644 sys/configure/structs/Game.PhotoFilter.go create mode 100644 sys/configure/structs/Game.PhotoFilterData.go diff --git a/bin/json/game_heroconvertdata.json b/bin/json/game_heroconvertdata.json index 62a83d983..e59075f0f 100644 --- a/bin/json/game_heroconvertdata.json +++ b/bin/json/game_heroconvertdata.json @@ -1,18 +1,18 @@ [ { "race": 1, - "id": "50001" + "id": "14010111" }, { "race": 2, - "id": "50002" + "id": "14010212" }, { "race": 3, - "id": "50003" + "id": "14010313" }, { "race": 4, - "id": "50004" + "id": "14010414" } ] \ No newline at end of file diff --git a/bin/json/game_photoaction.json b/bin/json/game_photoaction.json new file mode 100644 index 000000000..9b890635f --- /dev/null +++ b/bin/json/game_photoaction.json @@ -0,0 +1,56 @@ +[ + { + "id": 1, + "actionname": { + "key": "photoshop_action_actionname_1", + "text": "交谈" + }, + "empty": "camerapose_1", + "img": "lj_img_dj" + }, + { + "id": 2, + "actionname": { + "key": "photoshop_action_actionname_2", + "text": "激动" + }, + "empty": "camerapose_2", + "img": "lj_img_dj" + }, + { + "id": 3, + "actionname": { + "key": "photoshop_action_actionname_3", + "text": "惊吓" + }, + "empty": "camerapose_3", + "img": "lj_img_dj" + }, + { + "id": 4, + "actionname": { + "key": "photoshop_action_actionname_4", + "text": "沉思" + }, + "empty": "camerapose_4", + "img": "lj_img_dj" + }, + { + "id": 5, + "actionname": { + "key": "photoshop_action_actionname_5", + "text": "坐" + }, + "empty": "camerapose_5", + "img": "lj_img_dj" + }, + { + "id": 6, + "actionname": { + "key": "photoshop_action_actionname_6", + "text": "跑" + }, + "empty": "camerapose_6", + "img": "lj_img_dj" + } +] \ No newline at end of file diff --git a/bin/json/game_photofilter.json b/bin/json/game_photofilter.json new file mode 100644 index 000000000..ebb689ec3 --- /dev/null +++ b/bin/json/game_photofilter.json @@ -0,0 +1,65 @@ +[ + { + "id": 1, + "filtername": { + "key": "photoshop_filter_filtername_1", + "text": "洛圣都" + }, + "filter": "效果1", + "img": "lj_img_tp" + }, + { + "id": 2, + "filtername": { + "key": "photoshop_filter_filtername_2", + "text": "迈阿密" + }, + "filter": "效果2", + "img": "lj_img_tp" + }, + { + "id": 3, + "filtername": { + "key": "photoshop_filter_filtername_3", + "text": "功夫早晨" + }, + "filter": "效果3", + "img": "lj_img_01" + }, + { + "id": 4, + "filtername": { + "key": "photoshop_filter_filtername_4", + "text": "史莱克回忆" + }, + "filter": "效果4", + "img": "lj_img_02" + }, + { + "id": 5, + "filtername": { + "key": "photoshop_filter_filtername_5", + "text": "波比暖阳" + }, + "filter": "效果5", + "img": "lj_img_03" + }, + { + "id": 6, + "filtername": { + "key": "photoshop_filter_filtername_6", + "text": "梦魇降临" + }, + "filter": "效果6", + "img": "lj_img_04" + }, + { + "id": 7, + "filtername": { + "key": "photoshop_filter_filtername_7", + "text": "佛罗伦萨" + }, + "filter": "效果7", + "img": "lj_img_tp" + } +] \ No newline at end of file diff --git a/bin/json/game_playerinfor_overview.json b/bin/json/game_playerinfor_overview.json index 8071b33ba..1aac62f40 100644 --- a/bin/json/game_playerinfor_overview.json +++ b/bin/json/game_playerinfor_overview.json @@ -1,53 +1,92 @@ [ { "id": "16010101", + "sex": 1, "type": 1, - "micon": "icon/sbkp_js_nz", - "wicon": "icon/sbkp_js_nvz", + "icon": "icon/sbkp_js_nz", "tujing": [ 107 ], - "murl": "100001", - "wurl": "200001", - "mplayerhead": "ytx_js_14004", - "wplayerhead": "tx_js_nvz", + "url": "100001", + "playerhead": "tx_js_nz", "name": { "key": "playerinfor_playerinfor_overview_name_1", - "text": "普通皮肤" + "text": "男人的皮肤" + } + }, + { + "id": "16010101", + "sex": 2, + "type": 1, + "icon": "icon/sbkp_js_nvz", + "tujing": [ + 107 + ], + "url": "200001", + "playerhead": "tx_js_nvz", + "name": { + "key": "playerinfor_playerinfor_overview_name_2", + "text": "女人的皮肤" } }, { "id": "16010201", + "sex": 1, "type": 2, - "micon": "icon/zj_dz_001", - "wicon": "icon/zj_dz_001", + "icon": "icon/zj_dz_001", "tujing": [ 107 ], - "murl": "explore", - "wurl": "explore", - "mplayerhead": "ytx_js_14004", - "wplayerhead": "tx_js_nvz", + "url": "explore", + "playerhead": "tx_js_nz", "name": { - "key": "playerinfor_playerinfor_overview_name_2", - "text": "普通动作" + "key": "playerinfor_playerinfor_overview_name_3", + "text": "男人的动作" + } + }, + { + "id": "16010201", + "sex": 2, + "type": 2, + "icon": "icon/zj_dz_001", + "tujing": [ + 107 + ], + "url": "explore", + "playerhead": "tx_js_nvz", + "name": { + "key": "playerinfor_playerinfor_overview_name_4", + "text": "女人的动作" } }, { "id": "16010301", + "sex": 1, "type": 3, - "micon": "protagonistsystem/zj_bg_xk", - "wicon": "protagonistsystem/zj_bg_xk", + "icon": "protagonistsystem/zj_bg_xk", "tujing": [ 107 ], - "murl": "character_cardshow", - "wurl": "character_cardshow", - "mplayerhead": "ytx_js_14004", - "wplayerhead": "tx_js_nvz", + "url": "character_cardshow", + "playerhead": "tx_js_nz", "name": { - "key": "playerinfor_playerinfor_overview_name_3", - "text": "普通背景" + "key": "playerinfor_playerinfor_overview_name_5", + "text": "男人的背景" + } + }, + { + "id": "16010301", + "sex": 2, + "type": 3, + "icon": "protagonistsystem/zj_bg_xk", + "tujing": [ + 107 + ], + "url": "character_cardshow", + "playerhead": "tx_js_nvz", + "name": { + "key": "playerinfor_playerinfor_overview_name_6", + "text": "女人的背景" } } ] \ No newline at end of file diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 76d3237af..b70f39a4d 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -4469,7 +4469,7 @@ "Argu": [ 1, 4, - 1000 + 1500 ], "FollowSK": [], "SucFollowSK": [ @@ -4515,7 +4515,7 @@ "Argu": [ 1, 4, - 1000 + 1500 ], "FollowSK": [], "SucFollowSK": [ @@ -4561,7 +4561,7 @@ "Argu": [ 1, 4, - 1000 + 1500 ], "FollowSK": [], "SucFollowSK": [ @@ -4607,7 +4607,7 @@ "Argu": [ 1, 4, - 1050 + 1500 ], "FollowSK": [], "SucFollowSK": [ @@ -4653,7 +4653,7 @@ "Argu": [ 1, 4, - 1050 + 1500 ], "FollowSK": [], "SucFollowSK": [ @@ -4699,7 +4699,7 @@ "Argu": [ 1, 4, - 950 + 1250 ], "FollowSK": [], "SucFollowSK": [ @@ -4748,7 +4748,7 @@ "Argu": [ 1, 4, - 1000 + 1250 ], "FollowSK": [], "SucFollowSK": [ @@ -4797,7 +4797,7 @@ "Argu": [ 1, 4, - 1000 + 1250 ], "FollowSK": [], "SucFollowSK": [ @@ -4846,7 +4846,7 @@ "Argu": [ 1, 4, - 1150 + 1250 ], "FollowSK": [], "SucFollowSK": [ @@ -4895,7 +4895,7 @@ "Argu": [ 1, 4, - 1150 + 1250 ], "FollowSK": [], "SucFollowSK": [ @@ -4944,7 +4944,7 @@ "Argu": [ 1, 4, - 2400 + 4000 ], "FollowSK": [], "SucFollowSK": [], diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index ca42fb9ba..e3553481d 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -6,7 +6,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_125004011", - "text": "波比队长技" + "text": "队长技" }, "ico": "jn_dzj_0014", "CorrectPos": 0, @@ -475,7 +475,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_135002011", - "text": "希卡普队长技" + "text": "队长技" }, "ico": "jn_dzj_0020", "CorrectPos": 0, @@ -1797,7 +1797,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_134006211", - "text": "攻击全体敌方，伤害为自身攻击力70%，70%概率降低目标30%行动值；" + "text": "攻击全体敌方，伤害为自身攻击力210%，70%概率降低目标30%行动值；" }, "buffid": [], "map": "" @@ -1942,7 +1942,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_134006311", - "text": "攻击敌方全体，伤害为自身攻击力100%，90%概率为目标附加2回合【速度下降】和1回合【冰冻】" + "text": "攻击敌方全体，伤害为自身攻击力300%，90%概率为目标附加2回合【速度下降】和1回合【冰冻】" }, "buffid": [ 390001008, @@ -2102,7 +2102,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_934006411", - "text": "攻击全体敌方，伤害为自身攻击力70%，70%概率降低目标30%行动值；目标有【速度下降】时，降低行动值翻倍。" + "text": "攻击全体敌方，伤害为自身攻击力400%，70%概率降低目标30%行动值；目标有【速度下降】时，降低行动值翻倍。" }, "buffid": [ 390001008 @@ -2240,7 +2240,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_125001011", - "text": "阿宝队长技" + "text": "队长技" }, "ico": "jn_dzj_0029", "CorrectPos": 0, @@ -2288,7 +2288,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_125001111", - "text": "对敌方1个目标造成2次攻击力30%及防御力50%的伤害,有50%概率为目标附加2回合【攻击下降】" + "text": "对敌方1个目标造成2次攻击力30%及防御力150%的伤害,有50%概率为目标附加2回合【攻击下降】" }, "buffid": [ 390001006 @@ -2750,7 +2750,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_125001311", - "text": "攻击1个敌方，伤害为自身攻击力80%及防御力100%，为自身附加2回合【防御提升】和【免疫】。" + "text": "攻击1个敌方，伤害为自身攻击力80%及防御力500%，为自身附加2回合【防御提升】和【免疫】。" }, "buffid": [ 390001002, @@ -3078,7 +3078,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_144005011", - "text": "在竞技场中，我方全体攻击增加30%" + "text": "我方全体攻击增加30%" }, "buffid": [], "map": "" @@ -3107,7 +3107,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_144005111", - "text": "小伊对敌方1个目标攻击2次，每次造成攻击力60%的伤害，并有50%概率吸收目标15%行动值。" + "text": "小伊对敌方1个目标攻击2次，每次造成攻击力180%的伤害，并有50%概率吸收目标15%行动值。" }, "buffid": [], "map": "" @@ -3252,7 +3252,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_144005211", - "text": "攻击1个敌方4次，每次伤害为自身攻击力45%，每次有30%概率为目标附加1回合【眩晕】。" + "text": "攻击1个敌方4次，每次伤害为自身攻击力125%，每次有30%概率为目标附加1回合【眩晕】。" }, "buffid": [ 390001105 @@ -3409,7 +3409,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_144005311", - "text": "攻击全体敌方，伤害为自身攻击力85%，75%概率驱散目标1个增益，每个驱散的增益提升全体友方5%行动值。" + "text": "攻击全体敌方，伤害为自身攻击力400%，75%概率驱散目标1个增益，每个驱散的增益提升全体友方5%行动值。" }, "buffid": [], "map": "" @@ -3565,7 +3565,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_944005411", - "text": "攻击全体敌方，伤害为自身攻击力85%，75%概率驱散目标1个增益，每个驱散的增益提升全体友方5%行动值。增加目标所有技能1回合冷却。" + "text": "攻击全体敌方，伤害为自身攻击力400%，75%概率驱散目标1个增益，每个驱散的增益提升全体友方5%行动值。增加目标所有技能1回合冷却。" }, "buffid": [], "map": "" @@ -3753,7 +3753,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_135001111", - "text": "攻击1个敌方，伤害为自身攻击力100%,攻击溅射随机2个敌方，伤害为自身攻击力70%。攻击前随机获得一种神力，持续1回合；神力包含【气】、【劲】、【法】。" + "text": "攻击1个敌方，伤害为自身攻击力360%,攻击溅射随机2个敌方，伤害为自身攻击力180%。攻击前随机获得一种神力，持续1回合；神力包含【气】、【劲】、【法】。" }, "buffid": [ 390001119, @@ -3789,7 +3789,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_135001111", - "text": "造成的伤害提升105%" + "text": "造成的伤害提升10%" }, "buffid": [ 390001119, @@ -3825,7 +3825,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_135001111", - "text": "对额外目标的伤害提升至70%" + "text": "对额外目标的伤害提升10%" }, "buffid": [ 390001119, @@ -3861,7 +3861,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_135001111", - "text": "造成的伤害提升至110%" + "text": "造成的伤害提升10%" }, "buffid": [ 390001119, @@ -3897,7 +3897,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_135001111", - "text": "对额外目标的伤害提升至80%" + "text": "对额外目标的伤害提升10%" }, "buffid": [ 390001119, @@ -3933,7 +3933,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_135001111", - "text": "造成的伤害提升至120%" + "text": "造成的伤害提升10%" }, "buffid": [ 390001119, @@ -4120,7 +4120,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_135001311", - "text": "攻击全体敌方2次，每次伤害为自身攻击50%。攻击前获得全部神力，持续2回合；神力包含【气】、【劲】、【法】。" + "text": "攻击全体敌方2次，每次伤害为自身攻击360%。攻击前获得全部神力，持续2回合；神力包含【气】、【劲】、【法】。" }, "buffid": [ 390001119, @@ -4268,7 +4268,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_935001411", - "text": "攻击1个敌方，伤害为自身攻击力170%。为自身附加2回合【护盾】，护盾量为自身最大生命值10%。吸收所有神力恢复自身生命，每个神力提供自身最大生命值10%恢复量、最大生命值5%护盾量和10%额外伤害。" + "text": "攻击1个敌方，伤害为自身攻击力510%。为自身附加2回合【护盾】，护盾量为自身最大生命值10%。吸收所有神力恢复自身生命，每个神力提供自身最大生命值10%恢复量、最大生命值5%护盾量和10%额外伤害。" }, "buffid": [ 390001112 @@ -4302,7 +4302,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_935001411", - "text": "伤害提升至180%" + "text": "伤害提升10%" }, "buffid": [ 390001112 @@ -4336,7 +4336,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_935001411", - "text": "伤害提升至190%" + "text": "伤害提升10%" }, "buffid": [ 390001112 @@ -4370,7 +4370,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_935001411", - "text": "伤害提升至200%" + "text": "伤害提升10%" }, "buffid": [ 390001112 @@ -4433,7 +4433,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124004011", - "text": "在泰坦远征，狩猎的挑战中，我方全体效果命中增加40%" + "text": "我方全体效果命中增加40%" }, "buffid": [], "map": "" @@ -4917,7 +4917,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_144006011", - "text": "公会战中全体生命值增加30%" + "text": "全体生命值增加30%" }, "buffid": [], "map": "" @@ -4946,7 +4946,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_144006111", - "text": "对敌方1个目标造成攻击力100%的伤害，自身每损失10%的生命，伤害提升5%，并附带护盾" + "text": "对敌方1个目标造成攻击力480%的伤害，自身每损失10%的生命，伤害提升5%，并附带护盾" }, "buffid": [], "map": "" @@ -5605,7 +5605,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_115005011", - "text": "在竞技场中，我方全体防御增加40%" + "text": "我方全体防御增加40%" }, "buffid": [], "map": "" @@ -5665,7 +5665,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_115005111", - "text": "伤害提升至95%" + "text": "伤害提升5%" }, "buffid": [], "map": "" @@ -5695,7 +5695,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_115005111", - "text": "伤害提升至100%" + "text": "伤害提升5%" }, "buffid": [], "map": "" @@ -5725,7 +5725,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_115005111", - "text": "伤害提升至105%" + "text": "伤害提升5%" }, "buffid": [], "map": "" @@ -5755,7 +5755,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_115005111", - "text": "伤害提升至110%" + "text": "伤害提升5%" }, "buffid": [], "map": "" @@ -6012,7 +6012,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_115004111", - "text": "攻击1个敌方3次，总伤害为自身攻击力100%，每次吸收目标10%行动值。" + "text": "攻击1个敌方3次，总伤害为自身攻击力160%，每次吸收目标10%行动值。" }, "buffid": [], "map": "" @@ -6041,7 +6041,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_115004111", - "text": "伤害提升至105%" + "text": "伤害提升5%" }, "buffid": [], "map": "" @@ -6070,7 +6070,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_115004111", - "text": "伤害提升至110%" + "text": "伤害提升5%" }, "buffid": [], "map": "" @@ -6099,7 +6099,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_115004111", - "text": "伤害提升至115%" + "text": "伤害提升5%" }, "buffid": [], "map": "" @@ -6128,7 +6128,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_115004211", - "text": "攻击全体敌方，伤害为自身攻击力70%，85%概率为目标附加1回合【眩晕】。" + "text": "攻击全体敌方，伤害为自身攻击力170%，85%概率为目标附加1回合【眩晕】。" }, "buffid": [ 390001105 @@ -6159,7 +6159,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_115004211", - "text": "伤害提升至75%" + "text": "伤害提升5%" }, "buffid": [ 390001105 @@ -6221,7 +6221,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_115004211", - "text": "伤害提升至80%" + "text": "伤害提升5%" }, "buffid": [ 390001105 @@ -6283,7 +6283,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_115004311", - "text": "攻击全体敌方3次，总伤害为自身攻击力90。每次有50%概率驱散目标1个增益，降低目标10%行动值。" + "text": "攻击全体敌方3次，总伤害为自身攻击力180%。每次有50%概率驱散目标1个增益，降低目标10%行动值。" }, "buffid": [], "map": "" @@ -6458,7 +6458,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_915004211", - "text": "攻击全体敌方，伤害为自身攻击力70%，每次有85%概率为目标附加1回合【眩晕】。每个被【眩晕】的目标提升自身15%行动值。" + "text": "攻击全体敌方，伤害为自身攻击力170%，每次有85%概率为目标附加1回合【眩晕】。每个被【眩晕】的目标提升自身15%行动值。" }, "buffid": [ 390001105 @@ -6646,7 +6646,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124002111", - "text": "攻击随机2个敌方，伤害为自身攻击力55%，为目标附加【童真】。" + "text": "攻击随机2个敌方，伤害为自身攻击力200%，为目标附加【童真】。" }, "buffid": [ 390001211 @@ -6677,7 +6677,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124002111", - "text": "伤害提升至60%" + "text": "伤害提升5%" }, "buffid": [ 390001211 @@ -6708,7 +6708,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124002111", - "text": "伤害提升至65%" + "text": "伤害提升5%" }, "buffid": [ 390001211 @@ -6739,7 +6739,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124002111", - "text": "伤害提升至70%" + "text": "伤害提升5%" }, "buffid": [ 390001211 @@ -6770,7 +6770,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124002111", - "text": "伤害提升至75%" + "text": "伤害提升5%" }, "buffid": [ 390001211 @@ -6801,7 +6801,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124002111", - "text": "伤害提升至80%" + "text": "伤害提升5%" }, "buffid": [ 390001211 @@ -6866,7 +6866,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124002311", - "text": "攻击全体敌方3次，总伤害为自身攻击力90%。" + "text": "攻击全体敌方3次，总伤害为自身攻击力600%。" }, "buffid": [ 390001211, @@ -6899,7 +6899,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124002311", - "text": "伤害提升至95%" + "text": "伤害提升5%" }, "buffid": [ 390001211, @@ -6932,7 +6932,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124002311", - "text": "伤害提升至100%" + "text": "伤害提升5%" }, "buffid": [ 390001211, @@ -6965,7 +6965,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124002311", - "text": "伤害提升至105%" + "text": "伤害提升5%" }, "buffid": [ 390001211, @@ -6998,7 +6998,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124002311", - "text": "伤害提升至110%" + "text": "伤害提升5%" }, "buffid": [ 390001211, @@ -7578,7 +7578,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_114003011", - "text": "在狩猎、维京远征的挑战中，我方全体速度增加25%" + "text": "我方全体速度增加25%" }, "buffid": [], "map": "" @@ -7607,7 +7607,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_114003111", - "text": "攻击1个敌方，伤害为自身攻击力50%，50%概率降低目标30%行动值。每点速度提供攻击力0.33%额外伤害。" + "text": "攻击1个敌方，伤害为自身攻击力150%，50%概率降低目标30%行动值。每点速度提供攻击力0.33%额外伤害。" }, "buffid": [], "map": "" @@ -7636,7 +7636,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_114003111", - "text": "伤害提升至55%" + "text": "伤害提升5%" }, "buffid": [], "map": "" @@ -7694,7 +7694,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_114003111", - "text": "伤害提升至60%" + "text": "伤害提升5%" }, "buffid": [], "map": "" @@ -7723,7 +7723,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_114003111", - "text": "伤害提升至70%" + "text": "伤害提升5%" }, "buffid": [], "map": "" @@ -7753,7 +7753,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_114003211", - "text": "攻击1个敌方，伤害为自身攻击150%，80%概率为目标附加2回合【速度下降】。暴击时为自身附加2回合【速度提升】。每点速度提供攻击0.33%。" + "text": "攻击1个敌方，伤害为自身攻击225%，80%概率为目标附加2回合【速度下降】。暴击时为自身附加2回合【速度提升】。每点速度提供攻击0.33%。" }, "buffid": [ 390001008, @@ -7786,7 +7786,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_114003211", - "text": "伤害提升至160%" + "text": "伤害提升5%" }, "buffid": [ 390001008, @@ -7852,7 +7852,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_114003211", - "text": "伤害提升至180%" + "text": "伤害提升5%" }, "buffid": [ 390001008, @@ -7917,7 +7917,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_114003311", - "text": "攻击1个敌方3次，每次伤害为自身攻击力50%，每次有40%概率降低目标30%行动值。每点速度提供0.33%额外伤害。" + "text": "攻击1个敌方3次，每次伤害为自身攻击力265%，每次有40%概率降低目标30%行动值。每点速度提供0.33%额外伤害。" }, "buffid": [], "map": "" @@ -8062,7 +8062,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_145003011", - "text": "在竞技场中，我方全体生命值增加40%" + "text": "我方全体生命值增加40%" }, "buffid": [], "map": "" @@ -8274,7 +8274,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_135003011", - "text": "在竞技场中，我方全体效果抵抗增加50%" + "text": "我方全体效果抵抗增加50%" }, "buffid": [], "map": "" @@ -8633,7 +8633,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_113003011", - "text": "在积分赛中我方全体提升20%速度" + "text": "我方全体提升20%速度" }, "buffid": [], "map": "" @@ -8864,7 +8864,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_115001011", - "text": "吉姆·莱克队长技" + "text": "队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -9228,7 +9228,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124008011", - "text": "在祭祀神迹、声之神迹的挑战中，我方全体攻击增加30%" + "text": "我方全体攻击增加30%" }, "buffid": [], "map": "" @@ -9355,7 +9355,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_134008011", - "text": "在泰坦远征，狩猎的挑战中，我方全体生命增加40%" + "text": "我方全体生命增加40%" }, "buffid": [], "map": "" @@ -9720,7 +9720,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_114006011", - "text": "在联合对抗中，我方全体速度增加25%" + "text": "我方全体速度增加25%" }, "buffid": [], "map": "" @@ -10417,7 +10417,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_133003011", - "text": "在泰坦远征，狩猎的挑战中，我方全体暴击率增加20%" + "text": "我方全体暴击率增加20%" }, "buffid": [], "map": "" @@ -10634,7 +10634,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_134003011", - "text": "积分赛中，我方全体攻击增加30%" + "text": "我方全体攻击增加30%" }, "buffid": [], "map": "" @@ -10755,7 +10755,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_144004011", - "text": "在积分赛中，我方全体效果命中增加40%" + "text": "我方全体效果命中增加40%" }, "buffid": [], "map": "" @@ -10879,7 +10879,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_134007011", - "text": "在维京远征和狩猎的挑战中，我方全体攻击增加30%" + "text": "我方全体攻击增加30%" }, "buffid": [], "map": "" @@ -11101,7 +11101,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_113001011", - "text": "在积分赛中，我方全体防御增加24%" + "text": "我方全体防御增加24%" }, "buffid": [], "map": "" @@ -11637,7 +11637,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_115002011", - "text": "积分赛中，我方全体攻击增加40%" + "text": "我方全体攻击增加40%" }, "buffid": [], "map": "" @@ -12634,7 +12634,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_155001211", - "text": "（被动）：自身生命值越低，造成的伤害越高" + "text": "（被动）自身生命值越低，造成的伤害越高" }, "buffid": [], "map": "" @@ -12663,7 +12663,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_155001311", - "text": "对敌方全体目标造成1次伤害.CD:2" + "text": "对敌方全体目标造成1次伤害." }, "buffid": [], "map": "" @@ -12724,7 +12724,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_155002211", - "text": "（被动）：自身造成伤害时，回复造成伤害一定比例的生命值，自身行动次数越多，造成伤害越高" + "text": "（被动）自身造成伤害时，回复造成伤害一定比例的生命值，自身行动次数越多，造成伤害越高" }, "buffid": [], "map": "" @@ -12753,7 +12753,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_155002311", - "text": "对敌方全体造成1次伤害.CD:2" + "text": "对敌方全体造成1次伤害." }, "buffid": [], "map": "" @@ -13144,7 +13144,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_422", - "text": "对敌方1个目标造成攻击100%的无视防御伤害。（冷却回合：3）" + "text": "对敌方1个目标造成攻击100%的无视防御伤害。" }, "buffid": [], "map": "" @@ -13292,7 +13292,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_427", - "text": "己方全体在战斗开始的时候获得2回合【护盾】（数值为最大生命值的15%）" + "text": "己方全体在战斗开始的时候获得2回合【护盾】" }, "buffid": [], "map": "" @@ -13322,7 +13322,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_428", - "text": "我方被施加控制效果的神觉者速度提高50点（不可叠加）" + "text": "我方被施加控制效果的角色速度提高50点" }, "buffid": [], "map": "" @@ -13470,7 +13470,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_433", - "text": "为1个友方附加2回合[生死簿]记录当前生命值，2 回合后，回溯其生命值至记录值。为目标附加2 回合[复苏]和[攻击提升]。冷却回合: 4" + "text": "为1个友方附加2回合[生死簿]记录当前生命值，2 回合后，回溯其生命值至记录值。为目标附加2 回合[复苏]和[攻击提升]。" }, "buffid": [], "map": "" @@ -13499,7 +13499,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_434", - "text": "攻击全体敌方，伤害为自身攻击100%，降低目标30%最大生命值上限，50%概率为目标附加2回合[禁疗]冷却回合: 5" + "text": "攻击全体敌方，伤害为自身攻击100%，降低目标30%最大生命值上限，50%概率为目标附加2回合[禁疗]" }, "buffid": [], "map": "" @@ -13860,7 +13860,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_124007011", - "text": "小钱队长技" + "text": "队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -13877,7 +13877,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_447", - "text": "在积分赛中，我方全体生命增加30%" + "text": "我方全体生命增加30%" }, "buffid": [], "map": "" @@ -13980,7 +13980,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_123002011", - "text": "警卫队长队长技" + "text": "队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -14839,7 +14839,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_143004011", - "text": "姜饼人队长技" + "text": "队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -15150,7 +15150,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_490", - "text": "在积分赛中，我方全体攻击增加40%" + "text": "我方全体攻击增加40%" }, "buffid": [], "map": "" @@ -15249,7 +15249,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_124006011", - "text": "凯尔队长技" + "text": "队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -15365,7 +15365,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_114004011", - "text": "克莱尔队长技" + "text": "队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -15382,7 +15382,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_498", - "text": "在积分赛中，我方全体生命增加30%" + "text": "我方全体生命增加30%" }, "buffid": [], "map": "" @@ -15481,7 +15481,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_133004011", - "text": "普鲁格兰杰队长技" + "text": "队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -15615,7 +15615,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_506", - "text": "在泰坦远征，狩猎的挑战中，我方全体生命增加30%" + "text": "我方全体生命增加30%" }, "buffid": [], "map": "" @@ -15720,7 +15720,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_133006011", - "text": "珍妮丝·邓普顿队长技" + "text": "队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -15737,7 +15737,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_510", - "text": "队长技：我方全体效果抵抗增加20%" + "text": "我方全体效果抵抗增加20%" }, "buffid": [], "map": "" @@ -15836,7 +15836,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_125002011", - "text": "沃尔夫先生队长技" + "text": "队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -16248,7 +16248,7 @@ "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_144002011", - "text": "蛇先生队长技" + "text": "队长技" }, "ico": "jn_dzj_0021", "CorrectPos": 0, @@ -16265,7 +16265,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_528", - "text": "在祭祀神迹、声之神迹的挑战中，我方全体防御增加30%" + "text": "我方全体防御增加30%" }, "buffid": [], "map": "" diff --git a/modules/user/api_switchdefper.go b/modules/user/api_switchdefper.go index 881f92efe..7995f7e59 100644 --- a/modules/user/api_switchdefper.go +++ b/modules/user/api_switchdefper.go @@ -29,7 +29,7 @@ func (this *apiComp) SwitchDefPer(session comm.IUserSession, req *pb.UserSwitchD user = this.module.GetUser(session.GetUserId()) if req.CurSkin != "" { - if conf, err = this.module.configure.GetPlayerOverview(req.CurSkin); err != nil { + if conf, err = this.module.configure.GetPlayerOverview(req.CurSkin, user.Gender); err != nil { code = pb.ErrorCode_ConfigNoFound return } @@ -47,11 +47,13 @@ func (this *apiComp) SwitchDefPer(session comm.IUserSession, req *pb.UserSwitchD return } user.CurSkin = req.CurSkin + user.Avatar = conf.Playerhead + change["avatar"] = conf.Playerhead change["curSkin"] = req.CurSkin } if req.CurAction != "" { - if conf, err = this.module.configure.GetPlayerOverview(req.CurAction); err != nil { + if conf, err = this.module.configure.GetPlayerOverview(req.CurAction, user.Gender); err != nil { code = pb.ErrorCode_ConfigNoFound return } @@ -73,7 +75,7 @@ func (this *apiComp) SwitchDefPer(session comm.IUserSession, req *pb.UserSwitchD } if req.CurBg != "" { - if conf, err = this.module.configure.GetPlayerOverview(req.CurBg); err != nil { + if conf, err = this.module.configure.GetPlayerOverview(req.CurBg, user.Gender); err != nil { code = pb.ErrorCode_ConfigNoFound return } diff --git a/modules/user/comp_configure.go b/modules/user/comp_configure.go index 899255944..bf541a3cd 100644 --- a/modules/user/comp_configure.go +++ b/modules/user/comp_configure.go @@ -2,6 +2,7 @@ package user import ( "fmt" + "go_dreamfactory/comm" "go_dreamfactory/lego/core" "go_dreamfactory/modules" "go_dreamfactory/sys/configure" @@ -21,10 +22,11 @@ const ( ///配置管理基础组件 type configureComp struct { modules.MCompConfigure - module *User - hlock sync.RWMutex - _sign map[int32]*cfg.GameSignData - _signExtra map[int32]*cfg.GameSignExtraData + module *User + hlock sync.RWMutex + _sign map[int32]*cfg.GameSignData + _signExtra map[int32]*cfg.GameSignExtraData + _pInforoverview map[string]*cfg.GamePlayerInfor_overviewData } //组件初始化接口 @@ -37,7 +39,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp this.LoadConfigure(gameOpencond, cfg.NewGameOpencond) this._signExtra = make(map[int32]*cfg.GameSignExtraData, 0) configure.RegisterConfigure(game_SignExtra, cfg.NewGameSignExtra, this.LoadSignExtraData) - err = this.LoadConfigure(game_playerinfor_overview, cfg.NewGamePlayerInfor_overview) + configure.RegisterConfigure(game_playerinfor_overview, cfg.NewGamePlayerInfor_overview, this.updatePlayerOverview) return } @@ -152,20 +154,43 @@ func (this *configureComp) GetGlobalInitConf() (configure *cfg.GameInitial, err return } -func (this *configureComp) GetPlayerOverview(id string) (configure *cfg.GamePlayerInfor_overviewData, err error) { +func (this *configureComp) updatePlayerOverview() { var ( - v interface{} - ok bool + v interface{} + err error + key string + temp map[string]*cfg.GamePlayerInfor_overviewData ) if v, err = this.GetConfigure(game_playerinfor_overview); err != nil { this.module.Errorf("err:%v", err) return } else { - if configure, ok = v.(*cfg.GamePlayerInfor_overview).GetDataMap()[id]; !ok { - err = fmt.Errorf("GetPlayerOverview not found:%s ", id) - this.module.Errorf("err:%v", err) - return + temp = make(map[string]*cfg.GamePlayerInfor_overviewData) + for _, v := range v.(*cfg.GamePlayerInfor_overview).GetDataList() { + key = fmt.Sprintf("%s%d", v.Id, v.Sex) + temp[key] = v } + this._pInforoverview = temp + // if configure, ok = v.(*cfg.GamePlayerInfor_overview).GetDataMap()[id]; !ok { + // err = fmt.Errorf("GetPlayerOverview not found:%s ", id) + // this.module.Errorf("err:%v", err) + // return + // } } +} + +func (this *configureComp) GetPlayerOverview(id string, sex int32) (configure *cfg.GamePlayerInfor_overviewData, err error) { + var ( + key string + ok bool + ) + sex += 1 + key = fmt.Sprintf("%s%d", id, sex) + if configure, ok = this._pInforoverview[key]; !ok { + err = comm.NewNotFoundConfErr("用户模块", game_playerinfor_overview, key) + this.module.Errorf("err:%v", err) + return + } + return } diff --git a/modules/user/module.go b/modules/user/module.go index eaf209bdb..460ed9f72 100644 --- a/modules/user/module.go +++ b/modules/user/module.go @@ -976,13 +976,15 @@ func (this *User) AddPer(session comm.IUserSession, pers map[string]int32, bPush } if !iskeep { if user.CurSkin == "" || user.CurAction == "" || user.CurBg == "" { - if conf, err = this.configure.GetPlayerOverview(k); err != nil { + if conf, err = this.configure.GetPlayerOverview(k, user.Gender); err != nil { code = pb.ErrorCode_ConfigNoFound return } else { if user.CurSkin == "" && conf.Type == 1 { user.CurSkin = k + user.Avatar = conf.Playerhead change["curSkin"] = k + change["avatar"] = conf.Playerhead } if user.CurAction == "" && conf.Type == 2 { user.CurAction = k diff --git a/sys/configure/structs/Game.PhotoAction.go b/sys/configure/structs/Game.PhotoAction.go new file mode 100644 index 000000000..b08e5dc83 --- /dev/null +++ b/sys/configure/structs/Game.PhotoAction.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GamePhotoAction struct { + _dataMap map[int32]*GamePhotoActionData + _dataList []*GamePhotoActionData +} + +func NewGamePhotoAction(_buf []map[string]interface{}) (*GamePhotoAction, error) { + _dataList := make([]*GamePhotoActionData, 0, len(_buf)) + dataMap := make(map[int32]*GamePhotoActionData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGamePhotoActionData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GamePhotoAction{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GamePhotoAction) GetDataMap() map[int32]*GamePhotoActionData { + return table._dataMap +} + +func (table *GamePhotoAction) GetDataList() []*GamePhotoActionData { + return table._dataList +} + +func (table *GamePhotoAction) Get(key int32) *GamePhotoActionData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.PhotoActionData.go b/sys/configure/structs/Game.PhotoActionData.go new file mode 100644 index 000000000..b1ac0115c --- /dev/null +++ b/sys/configure/structs/Game.PhotoActionData.go @@ -0,0 +1,41 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GamePhotoActionData struct { + Id int32 + Actionname string + Empty string + Img string +} + +const TypeId_GamePhotoActionData = 1796754646 + +func (*GamePhotoActionData) GetTypeId() int32 { + return 1796754646 +} + +func (_v *GamePhotoActionData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["actionname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Actionname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Actionname, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; if _v.Empty, _ok_ = _buf["empty"].(string); !_ok_ { err = errors.New("empty error"); return } } + { var _ok_ bool; if _v.Img, _ok_ = _buf["img"].(string); !_ok_ { err = errors.New("img error"); return } } + return +} + +func DeserializeGamePhotoActionData(_buf map[string]interface{}) (*GamePhotoActionData, error) { + v := &GamePhotoActionData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.PhotoFilter.go b/sys/configure/structs/Game.PhotoFilter.go new file mode 100644 index 000000000..e47c94f33 --- /dev/null +++ b/sys/configure/structs/Game.PhotoFilter.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GamePhotoFilter struct { + _dataMap map[int32]*GamePhotoFilterData + _dataList []*GamePhotoFilterData +} + +func NewGamePhotoFilter(_buf []map[string]interface{}) (*GamePhotoFilter, error) { + _dataList := make([]*GamePhotoFilterData, 0, len(_buf)) + dataMap := make(map[int32]*GamePhotoFilterData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGamePhotoFilterData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GamePhotoFilter{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GamePhotoFilter) GetDataMap() map[int32]*GamePhotoFilterData { + return table._dataMap +} + +func (table *GamePhotoFilter) GetDataList() []*GamePhotoFilterData { + return table._dataList +} + +func (table *GamePhotoFilter) Get(key int32) *GamePhotoFilterData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.PhotoFilterData.go b/sys/configure/structs/Game.PhotoFilterData.go new file mode 100644 index 000000000..d34385572 --- /dev/null +++ b/sys/configure/structs/Game.PhotoFilterData.go @@ -0,0 +1,41 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GamePhotoFilterData struct { + Id int32 + Filtername string + Filter string + Img string +} + +const TypeId_GamePhotoFilterData = -1608177384 + +func (*GamePhotoFilterData) GetTypeId() int32 { + return -1608177384 +} + +func (_v *GamePhotoFilterData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["filtername"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Filtername error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Filtername, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; if _v.Filter, _ok_ = _buf["filter"].(string); !_ok_ { err = errors.New("filter error"); return } } + { var _ok_ bool; if _v.Img, _ok_ = _buf["img"].(string); !_ok_ { err = errors.New("img error"); return } } + return +} + +func DeserializeGamePhotoFilterData(_buf map[string]interface{}) (*GamePhotoFilterData, error) { + v := &GamePhotoFilterData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.PlayerInfor_overview.go b/sys/configure/structs/Game.PlayerInfor_overview.go index 5751b9e3f..44735c0be 100644 --- a/sys/configure/structs/Game.PlayerInfor_overview.go +++ b/sys/configure/structs/Game.PlayerInfor_overview.go @@ -9,34 +9,26 @@ package cfg type GamePlayerInfor_overview struct { - _dataMap map[string]*GamePlayerInfor_overviewData _dataList []*GamePlayerInfor_overviewData } func NewGamePlayerInfor_overview(_buf []map[string]interface{}) (*GamePlayerInfor_overview, error) { _dataList := make([]*GamePlayerInfor_overviewData, 0, len(_buf)) - dataMap := make(map[string]*GamePlayerInfor_overviewData) for _, _ele_ := range _buf { if _v, err2 := DeserializeGamePlayerInfor_overviewData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) - dataMap[_v.Id] = _v } } - return &GamePlayerInfor_overview{_dataList:_dataList, _dataMap:dataMap}, nil -} - -func (table *GamePlayerInfor_overview) GetDataMap() map[string]*GamePlayerInfor_overviewData { - return table._dataMap + return &GamePlayerInfor_overview{_dataList:_dataList}, nil } func (table *GamePlayerInfor_overview) GetDataList() []*GamePlayerInfor_overviewData { return table._dataList } -func (table *GamePlayerInfor_overview) Get(key string) *GamePlayerInfor_overviewData { - return table._dataMap[key] +func (table *GamePlayerInfor_overview) Get(index int) *GamePlayerInfor_overviewData { + return table._dataList[index] } - diff --git a/sys/configure/structs/Game.PlayerInfor_overviewData.go b/sys/configure/structs/Game.PlayerInfor_overviewData.go index 9714926c0..28095c2c9 100644 --- a/sys/configure/structs/Game.PlayerInfor_overviewData.go +++ b/sys/configure/structs/Game.PlayerInfor_overviewData.go @@ -12,14 +12,12 @@ import "errors" type GamePlayerInfor_overviewData struct { Id string + Sex int32 Type int32 - Micon string - Wicon string + Icon string Tujing []int32 - Murl string - Wurl string - Mplayerhead string - Wplayerhead string + Url string + Playerhead string Name string } @@ -31,9 +29,9 @@ func (*GamePlayerInfor_overviewData) GetTypeId() int32 { func (_v *GamePlayerInfor_overviewData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sex"].(float64); !_ok_ { err = errors.New("sex error"); return }; _v.Sex = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } - { var _ok_ bool; if _v.Micon, _ok_ = _buf["micon"].(string); !_ok_ { err = errors.New("micon error"); return } } - { var _ok_ bool; if _v.Wicon, _ok_ = _buf["wicon"].(string); !_ok_ { err = errors.New("wicon error"); return } } + { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } { var _arr_ []interface{} var _ok_ bool @@ -48,10 +46,8 @@ func (_v *GamePlayerInfor_overviewData)Deserialize(_buf map[string]interface{}) } } - { var _ok_ bool; if _v.Murl, _ok_ = _buf["murl"].(string); !_ok_ { err = errors.New("murl error"); return } } - { var _ok_ bool; if _v.Wurl, _ok_ = _buf["wurl"].(string); !_ok_ { err = errors.New("wurl error"); return } } - { var _ok_ bool; if _v.Mplayerhead, _ok_ = _buf["mplayerhead"].(string); !_ok_ { err = errors.New("mplayerhead error"); return } } - { var _ok_ bool; if _v.Wplayerhead, _ok_ = _buf["wplayerhead"].(string); !_ok_ { err = errors.New("wplayerhead error"); return } } + { var _ok_ bool; if _v.Url, _ok_ = _buf["url"].(string); !_ok_ { err = errors.New("url error"); return } } + { var _ok_ bool; if _v.Playerhead, _ok_ = _buf["playerhead"].(string); !_ok_ { err = errors.New("playerhead error"); return } } {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 } } } return } diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index 7cb8be625..ced34747a 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -195,6 +195,8 @@ type Tables struct { TalentBox *GameTalentBox BuriedCondi *GameBuriedCondi BuriedType *GameBuriedType + PhotoAction *GamePhotoAction + PhotoFilter *GamePhotoFilter } func NewTables(loader JsonLoader) (*Tables, error) { @@ -1306,5 +1308,17 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.BuriedType, err = NewGameBuriedType(buf) ; err != nil { return nil, err } + if buf, err = loader("game_photoaction") ; err != nil { + return nil, err + } + if tables.PhotoAction, err = NewGamePhotoAction(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_photofilter") ; err != nil { + return nil, err + } + if tables.PhotoFilter, err = NewGamePhotoFilter(buf) ; err != nil { + return nil, err + } return tables, nil }