diff --git a/bin/json/LocalizeConfig_CN.json b/bin/json/LocalizeConfig_CN.json index e7b12a2ee..a3ef2fdc3 100644 --- a/bin/json/LocalizeConfig_CN.json +++ b/bin/json/LocalizeConfig_CN.json @@ -2958,5 +2958,9 @@ { "key": "mainline_name_10070", "text_cn": "Chapter 70" + }, + { + "key": "mainline_name_10071", + "text_cn": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。" } ] \ No newline at end of file diff --git a/bin/json/LocalizeConfig_EN.json b/bin/json/LocalizeConfig_EN.json index e4376f0ac..9d0b5eca7 100644 --- a/bin/json/LocalizeConfig_EN.json +++ b/bin/json/LocalizeConfig_EN.json @@ -2958,5 +2958,9 @@ { "key": "mainline_name_10070", "text_en": "" + }, + { + "key": "mainline_name_10071", + "text_en": "" } ] \ No newline at end of file diff --git a/bin/json/LocalizeConfig_TW.json b/bin/json/LocalizeConfig_TW.json index 7fa12d5aa..b987bd34a 100644 --- a/bin/json/LocalizeConfig_TW.json +++ b/bin/json/LocalizeConfig_TW.json @@ -2958,5 +2958,9 @@ { "key": "mainline_name_10070", "text_tw": "" + }, + { + "key": "mainline_name_10071", + "text_tw": "" } ] \ No newline at end of file diff --git a/bin/json/game_facemod.json b/bin/json/game_facemod.json new file mode 100644 index 000000000..152e7eef8 --- /dev/null +++ b/bin/json/game_facemod.json @@ -0,0 +1,332 @@ +[ + { + "id": 1001, + "suitintr": "预设1", + "figure": [ + { + "id": 1, + "key": "hair", + "color": "#fffff", + "val": 0, + "positon_x": 0, + "positon_y": 0, + "positon_z": 0, + "icon": "face_icon_01" + }, + { + "id": 2, + "key": "eye", + "color": "#fffff", + "val": 0, + "positon_x": 0, + "positon_y": 0, + "positon_z": 0, + "icon": "face_icon_01" + }, + { + "id": 3, + "key": "mouth", + "color": "", + "val": 0, + "positon_x": 0, + "positon_y": 0, + "positon_z": 0, + "icon": "face_icon_01" + }, + { + "id": 4, + "key": "height", + "color": "", + "val": 5, + "positon_x": 0, + "positon_y": 0, + "positon_z": 0, + "icon": "" + }, + { + "id": 5, + "key": "size", + "color": "", + "val": 5, + "positon_x": 0, + "positon_y": 0, + "positon_z": 0, + "icon": "" + }, + { + "id": 6, + "key": "color", + "color": "#fffff", + "val": 0, + "positon_x": 0, + "positon_y": 0, + "positon_z": 0, + "icon": "" + } + ] + }, + { + "id": 1002, + "suitintr": "预设2", + "figure": [ + { + "id": 1, + "key": "hair", + "color": "#fffff", + "val": 0, + "positon_x": 0, + "positon_y": 0, + "positon_z": 0, + "icon": "face_icon_01" + }, + { + "id": 2, + "key": "eye", + "color": "#fffff", + "val": 0, + "positon_x": 0, + "positon_y": 0, + "positon_z": 0, + "icon": "face_icon_01" + }, + { + "id": 3, + "key": "mouth", + "color": "", + "val": 0, + "positon_x": 0, + "positon_y": 0, + "positon_z": 0, + "icon": "face_icon_01" + }, + { + "id": 4, + "key": "height", + "color": "", + "val": 5, + "positon_x": 0, + "positon_y": 0, + "positon_z": 0, + "icon": "" + }, + { + "id": 5, + "key": "size", + "color": "", + "val": 5, + "positon_x": 0, + "positon_y": 0, + "positon_z": 0, + "icon": "" + }, + { + "id": 6, + "key": "color", + "color": "#fffff", + "val": 0, + "positon_x": 0, + "positon_y": 0, + "positon_z": 0, + "icon": "" + } + ] + }, + { + "id": 1003, + "suitintr": "预设3", + "figure": [ + { + "id": 1, + "key": "hair", + "color": "#fffff", + "val": 0, + "positon_x": 0, + "positon_y": 0, + "positon_z": 0, + "icon": "face_icon_01" + }, + { + "id": 2, + "key": "eye", + "color": "#fffff", + "val": 0, + "positon_x": 0, + "positon_y": 0, + "positon_z": 0, + "icon": "face_icon_01" + }, + { + "id": 3, + "key": "mouth", + "color": "", + "val": 0, + "positon_x": 0, + "positon_y": 0, + "positon_z": 0, + "icon": "face_icon_01" + }, + { + "id": 4, + "key": "height", + "color": "", + "val": 5, + "positon_x": 0, + "positon_y": 0, + "positon_z": 0, + "icon": "" + }, + { + "id": 5, + "key": "size", + "color": "", + "val": 5, + "positon_x": 0, + "positon_y": 0, + "positon_z": 0, + "icon": "" + }, + { + "id": 6, + "key": "color", + "color": "#fffff", + "val": 0, + "positon_x": 0, + "positon_y": 0, + "positon_z": 0, + "icon": "" + } + ] + }, + { + "id": 1004, + "suitintr": "预设4", + "figure": [ + { + "id": 1, + "key": "hair", + "color": "#fffff", + "val": 0, + "positon_x": 0, + "positon_y": 0, + "positon_z": 0, + "icon": "face_icon_01" + }, + { + "id": 2, + "key": "eye", + "color": "#fffff", + "val": 0, + "positon_x": 0, + "positon_y": 0, + "positon_z": 0, + "icon": "face_icon_01" + }, + { + "id": 3, + "key": "mouth", + "color": "", + "val": 0, + "positon_x": 0, + "positon_y": 0, + "positon_z": 0, + "icon": "face_icon_01" + }, + { + "id": 4, + "key": "height", + "color": "", + "val": 5, + "positon_x": 0, + "positon_y": 0, + "positon_z": 0, + "icon": "" + }, + { + "id": 5, + "key": "size", + "color": "", + "val": 5, + "positon_x": 0, + "positon_y": 0, + "positon_z": 0, + "icon": "" + }, + { + "id": 6, + "key": "color", + "color": "#fffff", + "val": 0, + "positon_x": 0, + "positon_y": 0, + "positon_z": 0, + "icon": "" + } + ] + }, + { + "id": 1005, + "suitintr": "预设5", + "figure": [ + { + "id": 1, + "key": "hair", + "color": "#fffff", + "val": 0, + "positon_x": 0, + "positon_y": 0, + "positon_z": 0, + "icon": "face_icon_01" + }, + { + "id": 2, + "key": "eye", + "color": "#fffff", + "val": 0, + "positon_x": 0, + "positon_y": 0, + "positon_z": 0, + "icon": "face_icon_01" + }, + { + "id": 3, + "key": "mouth", + "color": "", + "val": 0, + "positon_x": 0, + "positon_y": 0, + "positon_z": 0, + "icon": "face_icon_01" + }, + { + "id": 4, + "key": "height", + "color": "", + "val": 5, + "positon_x": 0, + "positon_y": 0, + "positon_z": 0, + "icon": "" + }, + { + "id": 5, + "key": "size", + "color": "", + "val": 5, + "positon_x": 0, + "positon_y": 0, + "positon_z": 0, + "icon": "" + }, + { + "id": 6, + "key": "color", + "color": "#fffff", + "val": 0, + "positon_x": 0, + "positon_y": 0, + "positon_z": 0, + "icon": "" + } + ] + } +] \ No newline at end of file diff --git a/bin/json/game_herostarup.json b/bin/json/game_herostarup.json index 56e3527f0..031954a39 100644 --- a/bin/json/game_herostarup.json +++ b/bin/json/game_herostarup.json @@ -3,7 +3,7 @@ "key": 1, "id": "25001", "star": 4, - "needhero": "25001", + "needhero": 25001, "needherostar": 4, "needheronum": 1, "needrace": [ @@ -17,7 +17,7 @@ "key": 2, "id": "25001", "star": 5, - "needhero": "25001", + "needhero": 25001, "needherostar": 5, "needheronum": 1, "needrace": [ @@ -31,7 +31,7 @@ "key": 3, "id": "25001", "star": 6, - "needhero": "", + "needhero": 0, "needherostar": 0, "needheronum": 0, "needrace": [], @@ -43,7 +43,7 @@ "key": 4, "id": "25002", "star": 5, - "needhero": "25002", + "needhero": 25002, "needherostar": 5, "needheronum": 1, "needrace": [ @@ -57,7 +57,7 @@ "key": 5, "id": "25002", "star": 6, - "needhero": "", + "needhero": 0, "needherostar": 0, "needheronum": 0, "needrace": [], @@ -69,7 +69,7 @@ "key": 6, "id": "25003", "star": 5, - "needhero": "25003", + "needhero": 25003, "needherostar": 5, "needheronum": 1, "needrace": [ @@ -83,7 +83,7 @@ "key": 7, "id": "25003", "star": 6, - "needhero": "", + "needhero": 0, "needherostar": 0, "needheronum": 0, "needrace": [], @@ -95,7 +95,7 @@ "key": 8, "id": "15004", "star": 5, - "needhero": "15004", + "needhero": 15004, "needherostar": 5, "needheronum": 1, "needrace": [ @@ -109,7 +109,7 @@ "key": 9, "id": "15004", "star": 6, - "needhero": "", + "needhero": 0, "needherostar": 0, "needheronum": 0, "needrace": [], @@ -121,7 +121,7 @@ "key": 10, "id": "43901", "star": 3, - "needhero": "43901", + "needhero": 43901, "needherostar": 3, "needheronum": 1, "needrace": [ @@ -138,7 +138,7 @@ "key": 11, "id": "43901", "star": 4, - "needhero": "43901", + "needhero": 43901, "needherostar": 4, "needheronum": 1, "needrace": [ @@ -155,7 +155,7 @@ "key": 12, "id": "43901", "star": 5, - "needhero": "43901", + "needhero": 43901, "needherostar": 5, "needheronum": 1, "needrace": [ @@ -172,7 +172,7 @@ "key": 13, "id": "43901", "star": 6, - "needhero": "", + "needhero": 0, "needherostar": 0, "needheronum": 0, "needrace": [], diff --git a/bin/json/game_newhero.json b/bin/json/game_newhero.json index d7162b311..4f7bd215f 100644 --- a/bin/json/game_newhero.json +++ b/bin/json/game_newhero.json @@ -10,6 +10,7 @@ "race": 1, "job": 2, "type": 1, + "handbook": -1, "prefab": 13001, "icon": 13001, "sound": { @@ -38,7 +39,9 @@ "txt": { "key": "hero_55009", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "13002", @@ -51,6 +54,7 @@ "race": 1, "job": 1, "type": 1, + "handbook": -1, "prefab": 13002, "icon": 13002, "sound": { @@ -79,7 +83,9 @@ "txt": { "key": "hero_55010", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "13003", @@ -92,6 +98,7 @@ "race": 1, "job": 2, "type": 1, + "handbook": -1, "prefab": 13003, "icon": 13003, "sound": { @@ -120,7 +127,9 @@ "txt": { "key": "hero_55011", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "13004", @@ -133,6 +142,7 @@ "race": 1, "job": 1, "type": 1, + "handbook": -1, "prefab": 13004, "icon": 13004, "sound": { @@ -161,7 +171,9 @@ "txt": { "key": "hero_55012", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "13005", @@ -174,6 +186,7 @@ "race": 1, "job": 3, "type": 1, + "handbook": -1, "prefab": 13005, "icon": 13005, "sound": { @@ -202,7 +215,9 @@ "txt": { "key": "hero_55013", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "14001", @@ -215,6 +230,7 @@ "race": 1, "job": 2, "type": 1, + "handbook": -1, "prefab": 14001, "icon": 14001, "sound": { @@ -243,7 +259,9 @@ "txt": { "key": "hero_55014", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "14002", @@ -256,6 +274,7 @@ "race": 1, "job": 2, "type": 1, + "handbook": -1, "prefab": 14002, "icon": 14002, "sound": { @@ -284,7 +303,9 @@ "txt": { "key": "hero_55015", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "14003", @@ -297,6 +318,7 @@ "race": 1, "job": 4, "type": 1, + "handbook": -1, "prefab": 14003, "icon": 14003, "sound": { @@ -325,7 +347,9 @@ "txt": { "key": "hero_55016", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "14004", @@ -338,6 +362,7 @@ "race": 1, "job": 3, "type": 1, + "handbook": -1, "prefab": 14004, "icon": 14004, "sound": { @@ -366,7 +391,9 @@ "txt": { "key": "hero_55017", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "14005", @@ -379,6 +406,7 @@ "race": 1, "job": 1, "type": 1, + "handbook": -1, "prefab": 14005, "icon": 14005, "sound": { @@ -407,7 +435,9 @@ "txt": { "key": "hero_55018", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "14006", @@ -420,6 +450,7 @@ "race": 1, "job": 4, "type": 1, + "handbook": -1, "prefab": 14006, "icon": 14006, "sound": { @@ -448,7 +479,9 @@ "txt": { "key": "hero_55019", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "14007", @@ -461,6 +494,7 @@ "race": 1, "job": 2, "type": 1, + "handbook": -1, "prefab": 14007, "icon": 14007, "sound": { @@ -489,7 +523,9 @@ "txt": { "key": "hero_55020", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "15001", @@ -502,6 +538,7 @@ "race": 1, "job": 1, "type": 1, + "handbook": -1, "prefab": 15001, "icon": 15001, "sound": { @@ -530,7 +567,9 @@ "txt": { "key": "hero_55021", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "15002", @@ -543,6 +582,7 @@ "race": 1, "job": 1, "type": 1, + "handbook": -1, "prefab": 15002, "icon": 15002, "sound": { @@ -571,7 +611,9 @@ "txt": { "key": "hero_55022", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "15003", @@ -584,6 +626,7 @@ "race": 1, "job": 1, "type": 1, + "handbook": -1, "prefab": 15003, "icon": 15003, "sound": { @@ -612,7 +655,9 @@ "txt": { "key": "hero_55023", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "15004", @@ -625,6 +670,7 @@ "race": 1, "job": 4, "type": 1, + "handbook": -1, "prefab": 15004, "icon": 15004, "sound": { @@ -653,48 +699,9 @@ "txt": { "key": "hero_55024", "text": "" - } - }, - { - "hid": "15005", - "name": { - "key": "hero_15005", - "text": "亚力克斯" }, - "star": 5, - "color": 4, - "race": 1, - "job": 3, - "type": 1, - "prefab": 15005, - "icon": 15005, - "sound": { - "key": "15005", - "text": "" - }, - "tujing": [ - 1 - ], - "intr": { - "key": "", - "text": "" - }, - "events": "hero_15005", - "cite": "", - "effectstay": [], - "hpspace": { - "x": 0, - "y": 0, - "z": 0 - }, - "skill": 190011000, - "skill1": 190012000, - "skill2": 190013000, - "skill3": 190014000, - "txt": { - "key": "hero_55025", - "text": "" - } + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "23001", @@ -707,6 +714,7 @@ "race": 2, "job": 3, "type": 1, + "handbook": -1, "prefab": 23001, "icon": 23001, "sound": { @@ -735,7 +743,9 @@ "txt": { "key": "hero_55026", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "23002", @@ -748,6 +758,7 @@ "race": 2, "job": 1, "type": 1, + "handbook": -1, "prefab": 23002, "icon": 23002, "sound": { @@ -776,7 +787,9 @@ "txt": { "key": "hero_55027", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "23003", @@ -789,6 +802,7 @@ "race": 2, "job": 3, "type": 1, + "handbook": -1, "prefab": 23003, "icon": 23003, "sound": { @@ -817,7 +831,9 @@ "txt": { "key": "hero_55028", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "23004", @@ -830,6 +846,7 @@ "race": 2, "job": 4, "type": 1, + "handbook": -1, "prefab": 23004, "icon": 23004, "sound": { @@ -858,7 +875,9 @@ "txt": { "key": "hero_55029", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "24001", @@ -871,6 +890,7 @@ "race": 2, "job": 1, "type": 1, + "handbook": -1, "prefab": 24001, "icon": 24001, "sound": { @@ -899,7 +919,9 @@ "txt": { "key": "hero_55030", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "24002", @@ -912,6 +934,7 @@ "race": 2, "job": 1, "type": 1, + "handbook": -1, "prefab": 24002, "icon": 24002, "sound": { @@ -940,7 +963,9 @@ "txt": { "key": "hero_55031", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "24003", @@ -953,6 +978,7 @@ "race": 2, "job": 4, "type": 1, + "handbook": 1, "prefab": 24003, "icon": 24003, "sound": { @@ -981,7 +1007,9 @@ "txt": { "key": "hero_55032", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "24004", @@ -994,6 +1022,7 @@ "race": 2, "job": 1, "type": 1, + "handbook": -1, "prefab": 24004, "icon": 24004, "sound": { @@ -1022,7 +1051,9 @@ "txt": { "key": "hero_55033", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "24005", @@ -1035,6 +1066,7 @@ "race": 2, "job": 3, "type": 1, + "handbook": -1, "prefab": 24005, "icon": 24005, "sound": { @@ -1063,7 +1095,9 @@ "txt": { "key": "hero_55034", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "24006", @@ -1076,6 +1110,7 @@ "race": 2, "job": 3, "type": 1, + "handbook": -1, "prefab": 24006, "icon": 24006, "sound": { @@ -1104,7 +1139,9 @@ "txt": { "key": "hero_55035", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "24007", @@ -1117,6 +1154,7 @@ "race": 2, "job": 3, "type": 1, + "handbook": -1, "prefab": 24007, "icon": 24007, "sound": { @@ -1145,7 +1183,9 @@ "txt": { "key": "hero_55036", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "24008", @@ -1158,6 +1198,7 @@ "race": 2, "job": 1, "type": 1, + "handbook": -1, "prefab": 24008, "icon": 24008, "sound": { @@ -1186,7 +1227,9 @@ "txt": { "key": "hero_55037", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "24009", @@ -1199,6 +1242,7 @@ "race": 2, "job": 4, "type": 1, + "handbook": -1, "prefab": 24009, "icon": 24009, "sound": { @@ -1227,7 +1271,9 @@ "txt": { "key": "hero_55038", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "25001", @@ -1240,6 +1286,7 @@ "race": 2, "job": 2, "type": 1, + "handbook": 1, "prefab": 25001, "icon": 25001, "sound": { @@ -1268,7 +1315,9 @@ "txt": { "key": "hero_55039", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "25002", @@ -1281,6 +1330,7 @@ "race": 2, "job": 3, "type": 1, + "handbook": -1, "prefab": 25002, "icon": 25002, "sound": { @@ -1309,7 +1359,9 @@ "txt": { "key": "hero_55040", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "25003", @@ -1322,6 +1374,7 @@ "race": 2, "job": 4, "type": 1, + "handbook": -1, "prefab": 25003, "icon": 25003, "sound": { @@ -1350,7 +1403,9 @@ "txt": { "key": "hero_55041", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "25004", @@ -1363,6 +1418,7 @@ "race": 2, "job": 3, "type": 1, + "handbook": 1, "prefab": 25004, "icon": 25004, "sound": { @@ -1391,7 +1447,9 @@ "txt": { "key": "hero_55042", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "33001", @@ -1404,6 +1462,7 @@ "race": 3, "job": 3, "type": 1, + "handbook": -1, "prefab": 33001, "icon": 33001, "sound": { @@ -1432,7 +1491,9 @@ "txt": { "key": "hero_55043", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "33002", @@ -1445,6 +1506,7 @@ "race": 3, "job": 1, "type": 1, + "handbook": -1, "prefab": 33002, "icon": 33002, "sound": { @@ -1473,7 +1535,9 @@ "txt": { "key": "hero_55044", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "33003", @@ -1486,6 +1550,7 @@ "race": 3, "job": 1, "type": 1, + "handbook": -1, "prefab": 33003, "icon": 33003, "sound": { @@ -1514,7 +1579,9 @@ "txt": { "key": "hero_55045", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "33004", @@ -1527,6 +1594,7 @@ "race": 3, "job": 1, "type": 1, + "handbook": -1, "prefab": 33004, "icon": 33004, "sound": { @@ -1555,7 +1623,9 @@ "txt": { "key": "hero_55046", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "33005", @@ -1568,6 +1638,7 @@ "race": 3, "job": 1, "type": 1, + "handbook": -1, "prefab": 33005, "icon": 33005, "sound": { @@ -1596,7 +1667,9 @@ "txt": { "key": "hero_55047", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "33006", @@ -1609,6 +1682,7 @@ "race": 3, "job": 3, "type": 1, + "handbook": -1, "prefab": 33006, "icon": 33006, "sound": { @@ -1637,7 +1711,9 @@ "txt": { "key": "hero_55048", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "34001", @@ -1650,6 +1726,7 @@ "race": 3, "job": 1, "type": 1, + "handbook": -1, "prefab": 34001, "icon": 34001, "sound": { @@ -1678,7 +1755,9 @@ "txt": { "key": "hero_55049", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "34002", @@ -1691,6 +1770,7 @@ "race": 3, "job": 3, "type": 1, + "handbook": -1, "prefab": 34002, "icon": 34002, "sound": { @@ -1719,7 +1799,9 @@ "txt": { "key": "hero_55050", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "34003", @@ -1732,6 +1814,7 @@ "race": 3, "job": 1, "type": 1, + "handbook": -1, "prefab": 34003, "icon": 34003, "sound": { @@ -1760,7 +1843,9 @@ "txt": { "key": "hero_55051", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "34004", @@ -1773,6 +1858,7 @@ "race": 3, "job": 3, "type": 1, + "handbook": -1, "prefab": 34004, "icon": 34004, "sound": { @@ -1801,7 +1887,9 @@ "txt": { "key": "hero_55052", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "34005", @@ -1814,6 +1902,7 @@ "race": 3, "job": 4, "type": 1, + "handbook": -1, "prefab": 34005, "icon": 34005, "sound": { @@ -1842,7 +1931,9 @@ "txt": { "key": "hero_55053", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "34006", @@ -1855,6 +1946,7 @@ "race": 3, "job": 4, "type": 1, + "handbook": 1, "prefab": 34006, "icon": 34006, "sound": { @@ -1883,7 +1975,9 @@ "txt": { "key": "hero_55054", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "34007", @@ -1896,6 +1990,7 @@ "race": 3, "job": 1, "type": 1, + "handbook": -1, "prefab": 34007, "icon": 34007, "sound": { @@ -1924,7 +2019,9 @@ "txt": { "key": "hero_55055", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "34008", @@ -1937,6 +2034,7 @@ "race": 3, "job": 4, "type": 1, + "handbook": -1, "prefab": 34008, "icon": 34008, "sound": { @@ -1965,48 +2063,9 @@ "txt": { "key": "hero_55056", "text": "" - } - }, - { - "hid": "35001", - "name": { - "key": "hero_35001", - "text": "师父" }, - "star": 5, - "color": 4, - "race": 3, - "job": 1, - "type": 1, - "prefab": 35001, - "icon": 35001, - "sound": { - "key": "35001", - "text": "" - }, - "tujing": [ - 1 - ], - "intr": { - "key": "", - "text": "" - }, - "events": "hero_35001", - "cite": "", - "effectstay": [], - "hpspace": { - "x": 0, - "y": 0, - "z": 0 - }, - "skill": 190011000, - "skill1": 190012000, - "skill2": 190013000, - "skill3": 190014000, - "txt": { - "key": "hero_55057", - "text": "" - } + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "35002", @@ -2019,6 +2078,7 @@ "race": 3, "job": 4, "type": 1, + "handbook": 1, "prefab": 35002, "icon": 35002, "sound": { @@ -2047,7 +2107,9 @@ "txt": { "key": "hero_55058", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "35003", @@ -2060,6 +2122,7 @@ "race": 3, "job": 1, "type": 1, + "handbook": -1, "prefab": 35003, "icon": 35003, "sound": { @@ -2088,7 +2151,9 @@ "txt": { "key": "hero_55059", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "35004", @@ -2101,6 +2166,7 @@ "race": 3, "job": 1, "type": 1, + "handbook": -1, "prefab": 35004, "icon": 35004, "sound": { @@ -2129,7 +2195,9 @@ "txt": { "key": "hero_55060", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "35005", @@ -2142,6 +2210,7 @@ "race": 3, "job": 3, "type": 1, + "handbook": -1, "prefab": 35005, "icon": 35005, "sound": { @@ -2170,7 +2239,9 @@ "txt": { "key": "hero_55061", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "35006", @@ -2183,6 +2254,7 @@ "race": 3, "job": 3, "type": 1, + "handbook": -1, "prefab": 35006, "icon": 35006, "sound": { @@ -2211,7 +2283,9 @@ "txt": { "key": "hero_55062", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "43001", @@ -2224,6 +2298,7 @@ "race": 4, "job": 3, "type": 1, + "handbook": -1, "prefab": 43001, "icon": 43001, "sound": { @@ -2252,7 +2327,9 @@ "txt": { "key": "hero_55063", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "43002", @@ -2265,6 +2342,7 @@ "race": 4, "job": 4, "type": 1, + "handbook": -1, "prefab": 43002, "icon": 43002, "sound": { @@ -2293,7 +2371,9 @@ "txt": { "key": "hero_55064", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "43003", @@ -2306,6 +2386,7 @@ "race": 4, "job": 3, "type": 1, + "handbook": -1, "prefab": 43003, "icon": 43003, "sound": { @@ -2334,7 +2415,9 @@ "txt": { "key": "hero_55065", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "43004", @@ -2347,6 +2430,7 @@ "race": 4, "job": 1, "type": 1, + "handbook": -1, "prefab": 43004, "icon": 43004, "sound": { @@ -2375,7 +2459,9 @@ "txt": { "key": "hero_55066", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "43005", @@ -2388,6 +2474,7 @@ "race": 4, "job": 1, "type": 1, + "handbook": -1, "prefab": 43005, "icon": 43005, "sound": { @@ -2416,7 +2503,9 @@ "txt": { "key": "hero_55067", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "43006", @@ -2429,6 +2518,7 @@ "race": 4, "job": 3, "type": 1, + "handbook": -1, "prefab": 43006, "icon": 43006, "sound": { @@ -2457,7 +2547,9 @@ "txt": { "key": "hero_55068", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "43007", @@ -2470,6 +2562,7 @@ "race": 4, "job": 1, "type": 1, + "handbook": -1, "prefab": 43007, "icon": 43007, "sound": { @@ -2498,7 +2591,9 @@ "txt": { "key": "hero_55069", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "44001", @@ -2511,6 +2606,7 @@ "race": 4, "job": 3, "type": 1, + "handbook": -1, "prefab": 44001, "icon": 44001, "sound": { @@ -2539,7 +2635,9 @@ "txt": { "key": "hero_55070", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "44002", @@ -2552,6 +2650,7 @@ "race": 4, "job": 3, "type": 1, + "handbook": -1, "prefab": 44002, "icon": 44002, "sound": { @@ -2580,7 +2679,9 @@ "txt": { "key": "hero_55071", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "44003", @@ -2593,6 +2694,7 @@ "race": 4, "job": 1, "type": 1, + "handbook": -1, "prefab": 44003, "icon": 44003, "sound": { @@ -2621,7 +2723,9 @@ "txt": { "key": "hero_55072", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "44004", @@ -2634,6 +2738,7 @@ "race": 4, "job": 3, "type": 1, + "handbook": -1, "prefab": 44004, "icon": 44004, "sound": { @@ -2662,48 +2767,9 @@ "txt": { "key": "hero_55073", "text": "" - } - }, - { - "hid": "44005", - "name": { - "key": "hero_44005", - "text": "小伊" }, - "star": 4, - "color": 3, - "race": 4, - "job": 3, - "type": 1, - "prefab": 44005, - "icon": 44005, - "sound": { - "key": "44005", - "text": "" - }, - "tujing": [ - 1 - ], - "intr": { - "key": "", - "text": "" - }, - "events": "hero_44005", - "cite": "", - "effectstay": [], - "hpspace": { - "x": 0, - "y": 0, - "z": 0 - }, - "skill": 190011000, - "skill1": 190012000, - "skill2": 190013000, - "skill3": 190014000, - "txt": { - "key": "hero_55074", - "text": "" - } + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "44006", @@ -2716,6 +2782,7 @@ "race": 4, "job": 1, "type": 1, + "handbook": -1, "prefab": 44006, "icon": 44006, "sound": { @@ -2744,7 +2811,9 @@ "txt": { "key": "hero_55075", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "45001", @@ -2757,6 +2826,7 @@ "race": 4, "job": 1, "type": 1, + "handbook": -1, "prefab": 45001, "icon": 45001, "sound": { @@ -2785,7 +2855,9 @@ "txt": { "key": "hero_55076", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "45002", @@ -2798,6 +2870,7 @@ "race": 4, "job": 3, "type": 1, + "handbook": -1, "prefab": 45002, "icon": 45002, "sound": { @@ -2826,7 +2899,9 @@ "txt": { "key": "hero_55077", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "45003", @@ -2839,6 +2914,7 @@ "race": 4, "job": 3, "type": 1, + "handbook": -1, "prefab": 45003, "icon": 45003, "sound": { @@ -2867,7 +2943,9 @@ "txt": { "key": "hero_55078", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "45004", @@ -2880,6 +2958,7 @@ "race": 4, "job": 1, "type": 1, + "handbook": -1, "prefab": 45004, "icon": 45004, "sound": { @@ -2908,7 +2987,9 @@ "txt": { "key": "hero_55079", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "43901", @@ -2921,6 +3002,7 @@ "race": 4, "job": 5, "type": 2, + "handbook": -1, "prefab": 43901, "icon": 43901, "sound": { @@ -2949,7 +3031,9 @@ "txt": { "key": "hero_55080", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "42911", @@ -2962,6 +3046,7 @@ "race": 4, "job": 5, "type": 3, + "handbook": -1, "prefab": 42911, "icon": 42911, "sound": { @@ -2990,7 +3075,9 @@ "txt": { "key": "hero_55081", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "43911", @@ -3003,6 +3090,7 @@ "race": 4, "job": 5, "type": 3, + "handbook": -1, "prefab": 43911, "icon": 43911, "sound": { @@ -3031,7 +3119,9 @@ "txt": { "key": "hero_55082", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "44911", @@ -3044,6 +3134,7 @@ "race": 4, "job": 5, "type": 3, + "handbook": -1, "prefab": 44911, "icon": 44911, "sound": { @@ -3072,7 +3163,9 @@ "txt": { "key": "hero_55083", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "43921", @@ -3085,6 +3178,7 @@ "race": 4, "job": 5, "type": 4, + "handbook": -1, "prefab": 43921, "icon": 43921, "sound": { @@ -3113,7 +3207,9 @@ "txt": { "key": "hero_55084", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "44921", @@ -3126,6 +3222,7 @@ "race": 4, "job": 5, "type": 4, + "handbook": -1, "prefab": 44921, "icon": 44921, "sound": { @@ -3154,7 +3251,9 @@ "txt": { "key": "hero_55085", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "45921", @@ -3167,6 +3266,7 @@ "race": 4, "job": 5, "type": 4, + "handbook": -1, "prefab": 45921, "icon": 45921, "sound": { @@ -3195,7 +3295,9 @@ "txt": { "key": "hero_55086", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "51001", @@ -3208,6 +3310,7 @@ "race": 4, "job": 3, "type": 5, + "handbook": -1, "prefab": 51001, "icon": 51001, "sound": { @@ -3236,7 +3339,9 @@ "txt": { "key": "hero_55087", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "51002", @@ -3249,6 +3354,7 @@ "race": 4, "job": 3, "type": 5, + "handbook": -1, "prefab": 51002, "icon": 51002, "sound": { @@ -3277,7 +3383,9 @@ "txt": { "key": "hero_55088", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "51003", @@ -3290,6 +3398,7 @@ "race": 4, "job": 3, "type": 5, + "handbook": -1, "prefab": 51003, "icon": 51003, "sound": { @@ -3318,7 +3427,9 @@ "txt": { "key": "hero_55089", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "51004", @@ -3331,6 +3442,7 @@ "race": 4, "job": 3, "type": 5, + "handbook": -1, "prefab": 51004, "icon": 51004, "sound": { @@ -3359,7 +3471,9 @@ "txt": { "key": "hero_55090", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "51005", @@ -3372,6 +3486,7 @@ "race": 4, "job": 1, "type": 5, + "handbook": -1, "prefab": 51005, "icon": 51005, "sound": { @@ -3400,7 +3515,9 @@ "txt": { "key": "hero_55091", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "51006", @@ -3413,6 +3530,7 @@ "race": 4, "job": 3, "type": 5, + "handbook": -1, "prefab": 51006, "icon": 51006, "sound": { @@ -3441,7 +3559,9 @@ "txt": { "key": "hero_55092", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "51007", @@ -3454,6 +3574,7 @@ "race": 4, "job": 3, "type": 5, + "handbook": -1, "prefab": 51007, "icon": 51007, "sound": { @@ -3482,7 +3603,9 @@ "txt": { "key": "hero_55093", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "51008", @@ -3495,6 +3618,7 @@ "race": 4, "job": 1, "type": 5, + "handbook": -1, "prefab": 51008, "icon": 51008, "sound": { @@ -3523,7 +3647,9 @@ "txt": { "key": "hero_55094", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "51009", @@ -3536,6 +3662,7 @@ "race": 4, "job": 1, "type": 5, + "handbook": -1, "prefab": 51009, "icon": 51009, "sound": { @@ -3564,7 +3691,9 @@ "txt": { "key": "hero_55095", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "51010", @@ -3577,6 +3706,7 @@ "race": 4, "job": 1, "type": 5, + "handbook": -1, "prefab": 51010, "icon": 51010, "sound": { @@ -3605,7 +3735,9 @@ "txt": { "key": "hero_55096", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "51011", @@ -3618,6 +3750,7 @@ "race": 4, "job": 3, "type": 5, + "handbook": -1, "prefab": 51011, "icon": 51011, "sound": { @@ -3646,7 +3779,9 @@ "txt": { "key": "hero_55097", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "51012", @@ -3659,6 +3794,7 @@ "race": 4, "job": 3, "type": 5, + "handbook": -1, "prefab": 51012, "icon": 51012, "sound": { @@ -3687,7 +3823,9 @@ "txt": { "key": "hero_55098", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "51013", @@ -3700,6 +3838,7 @@ "race": 4, "job": 1, "type": 5, + "handbook": -1, "prefab": 51013, "icon": 51013, "sound": { @@ -3728,7 +3867,9 @@ "txt": { "key": "hero_55099", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "51014", @@ -3741,6 +3882,7 @@ "race": 4, "job": 1, "type": 5, + "handbook": -1, "prefab": 51014, "icon": 51014, "sound": { @@ -3769,7 +3911,9 @@ "txt": { "key": "hero_55100", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "53001", @@ -3782,6 +3926,7 @@ "race": 4, "job": 3, "type": 5, + "handbook": -1, "prefab": 53001, "icon": 53001, "sound": { @@ -3810,7 +3955,9 @@ "txt": { "key": "hero_55101", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "53002", @@ -3823,6 +3970,7 @@ "race": 4, "job": 1, "type": 5, + "handbook": -1, "prefab": 53002, "icon": 53002, "sound": { @@ -3851,7 +3999,9 @@ "txt": { "key": "hero_55102", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "53003", @@ -3864,6 +4014,7 @@ "race": 4, "job": 1, "type": 5, + "handbook": -1, "prefab": 53003, "icon": 53003, "sound": { @@ -3892,7 +4043,9 @@ "txt": { "key": "hero_55103", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "53004", @@ -3905,6 +4058,7 @@ "race": 4, "job": 1, "type": 5, + "handbook": -1, "prefab": 53004, "icon": 53004, "sound": { @@ -3933,7 +4087,9 @@ "txt": { "key": "hero_55104", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "53005", @@ -3946,6 +4102,7 @@ "race": 4, "job": 1, "type": 5, + "handbook": -1, "prefab": 53005, "icon": 53005, "sound": { @@ -3974,7 +4131,9 @@ "txt": { "key": "hero_55105", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "53006", @@ -3987,6 +4146,7 @@ "race": 4, "job": 3, "type": 5, + "handbook": -1, "prefab": 53006, "icon": 53006, "sound": { @@ -4015,7 +4175,9 @@ "txt": { "key": "hero_55106", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "55001", @@ -4028,6 +4190,7 @@ "race": 4, "job": 2, "type": 5, + "handbook": -1, "prefab": 55001, "icon": 55001, "sound": { @@ -4056,7 +4219,9 @@ "txt": { "key": "hero_55107", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "55002", @@ -4069,6 +4234,7 @@ "race": 4, "job": 2, "type": 5, + "handbook": -1, "prefab": 55002, "icon": 55002, "sound": { @@ -4097,7 +4263,9 @@ "txt": { "key": "hero_55108", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "55003", @@ -4110,6 +4278,7 @@ "race": 4, "job": 2, "type": 5, + "handbook": -1, "prefab": 55003, "icon": 55003, "sound": { @@ -4138,7 +4307,9 @@ "txt": { "key": "hero_55109", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "55004", @@ -4151,6 +4322,7 @@ "race": 4, "job": 2, "type": 5, + "handbook": -1, "prefab": 55004, "icon": 55004, "sound": { @@ -4179,7 +4351,9 @@ "txt": { "key": "hero_55110", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "55005", @@ -4192,6 +4366,7 @@ "race": 4, "job": 2, "type": 5, + "handbook": -1, "prefab": 55005, "icon": 55005, "sound": { @@ -4220,7 +4395,9 @@ "txt": { "key": "hero_55111", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "55006", @@ -4233,6 +4410,7 @@ "race": 4, "job": 2, "type": 5, + "handbook": -1, "prefab": 55006, "icon": 55006, "sound": { @@ -4261,7 +4439,9 @@ "txt": { "key": "hero_55112", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "55007", @@ -4274,6 +4454,7 @@ "race": 4, "job": 2, "type": 5, + "handbook": -1, "prefab": 55007, "icon": 55007, "sound": { @@ -4302,7 +4483,9 @@ "txt": { "key": "hero_55113", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 }, { "hid": "55008", @@ -4315,6 +4498,7 @@ "race": 4, "job": 2, "type": 5, + "handbook": -1, "prefab": 55008, "icon": 55008, "sound": { @@ -4343,6 +4527,1119 @@ "txt": { "key": "hero_55114", "text": "" - } + }, + "enteranivalue": 0, + "camerainterval": 0 + }, + { + "hid": "11001", + "name": { + "key": "11001", + "text": "阿宝" + }, + "star": 4, + "color": 3, + "race": 1, + "job": 1, + "type": 1, + "handbook": 0, + "prefab": 11001, + "icon": 11001, + "sound": { + "key": "121323", + "text": "" + }, + "tujing": [ + 1 + ], + "intr": { + "key": "", + "text": "" + }, + "events": "EventDataSet/Hero_11001.asset", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill": -1, + "skill1": 110011, + "skill2": 110012, + "skill3": 110013, + "txt": { + "key": "", + "text": "" + }, + "enteranivalue": 100, + "camerainterval": 0.5 + }, + { + "hid": "11002", + "name": { + "key": "11002", + "text": "原始人" + }, + "star": 5, + "color": 4, + "race": 1, + "job": 1, + "type": 1, + "handbook": 0, + "prefab": 11002, + "icon": 11002, + "sound": { + "key": "11002", + "text": "" + }, + "tujing": [ + 1 + ], + "intr": { + "key": "", + "text": "" + }, + "events": "EventDataSet/Hero_11002.asset", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill": -1, + "skill1": 110021, + "skill2": 110022, + "skill3": 110023, + "txt": { + "key": "", + "text": "" + }, + "enteranivalue": 0, + "camerainterval": 0.6 + }, + { + "hid": "11003", + "name": { + "key": "11003", + "text": "波比" + }, + "star": 5, + "color": 4, + "race": 2, + "job": 1, + "type": 1, + "handbook": 0, + "prefab": 11003, + "icon": 11003, + "sound": { + "key": "11003", + "text": "" + }, + "tujing": [ + 1 + ], + "intr": { + "key": "", + "text": "" + }, + "events": "EventDataSet/Hero_11003.asset", + "cite": "", + "effectstay": [ + "this,Skill/Role/11003/effect_11003_wuqitexiao" + ], + "hpspace": { + "x": 0, + "y": -0.69, + "z": 0 + }, + "skill": -1, + "skill1": 110031, + "skill2": 110032, + "skill3": 110033, + "txt": { + "key": "", + "text": "" + }, + "enteranivalue": 0, + "camerainterval": 0.6 + }, + { + "hid": "11004", + "name": { + "key": "11004", + "text": "布兰" + }, + "star": 5, + "color": 4, + "race": 1, + "job": 1, + "type": 1, + "handbook": 0, + "prefab": 11004, + "icon": 11004, + "sound": { + "key": "11004", + "text": "" + }, + "tujing": [ + 1 + ], + "intr": { + "key": "", + "text": "" + }, + "events": "hero_2011", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill": -1, + "skill1": 110041, + "skill2": 110042, + "skill3": 110043, + "txt": { + "key": "", + "text": "" + }, + "enteranivalue": 0, + "camerainterval": 0.6 + }, + { + "hid": "11005", + "name": { + "key": "11005", + "text": "无牙仔" + }, + "star": 4, + "color": 3, + "race": 1, + "job": 1, + "type": 1, + "handbook": 0, + "prefab": 11005, + "icon": 11005, + "sound": { + "key": "121323", + "text": "" + }, + "tujing": [ + 1 + ], + "intr": { + "key": "", + "text": "" + }, + "events": "EventDataSet/Hero_11001.asset", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill": -1, + "skill1": 110051, + "skill2": 110052, + "skill3": 110053, + "txt": { + "key": "", + "text": "" + }, + "enteranivalue": 0, + "camerainterval": 0.6 + }, + { + "hid": "11006", + "name": { + "key": "11006", + "text": "亚丝翠" + }, + "star": 5, + "color": 4, + "race": 1, + "job": 1, + "type": 1, + "handbook": 0, + "prefab": 11006, + "icon": 11006, + "sound": { + "key": "11006", + "text": "" + }, + "tujing": [ + 1 + ], + "intr": { + "key": "", + "text": "" + }, + "events": "hero_2011", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill": -1, + "skill1": 110061, + "skill2": 110062, + "skill3": 110063, + "txt": { + "key": "", + "text": "" + }, + "enteranivalue": 0, + "camerainterval": 0.6 + }, + { + "hid": "11009", + "name": { + "key": "11009", + "text": "希卡普" + }, + "star": 4, + "color": 3, + "race": 3, + "job": 2, + "type": 1, + "handbook": 0, + "prefab": 11009, + "icon": 11009, + "sound": { + "key": "11009", + "text": "" + }, + "tujing": [ + 1 + ], + "intr": { + "key": "", + "text": "" + }, + "events": "EventDataSet/Hero_11009.asset", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": -0.1, + "z": 0 + }, + "skill": -1, + "skill1": 110091, + "skill2": 110092, + "skill3": 110093, + "txt": { + "key": "", + "text": "" + }, + "enteranivalue": 0, + "camerainterval": 0.6 + }, + { + "hid": "22002", + "name": { + "key": "22002", + "text": "沈王爷青春版" + }, + "star": 5, + "color": 4, + "race": 2, + "job": 2, + "type": 1, + "handbook": 0, + "prefab": 22002, + "icon": 22002, + "sound": { + "key": "22002", + "text": "" + }, + "tujing": [ + 1 + ], + "intr": { + "key": "", + "text": "" + }, + "events": "hero_2011", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill": -1, + "skill1": 220021, + "skill2": 220022, + "skill3": 220023, + "txt": { + "key": "", + "text": "" + }, + "enteranivalue": 0, + "camerainterval": 0.6 + }, + { + "hid": "90001", + "name": { + "key": "90001", + "text": "邪恶阿宝" + }, + "star": 4, + "color": 3, + "race": 1, + "job": 1, + "type": 1, + "handbook": 0, + "prefab": 90001, + "icon": 90001, + "sound": { + "key": "90001", + "text": "" + }, + "tujing": [ + 1 + ], + "intr": { + "key": "", + "text": "" + }, + "events": "hero_90001", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill": -1, + "skill1": 900011, + "skill2": 900012, + "skill3": 900013, + "txt": { + "key": "", + "text": "" + }, + "enteranivalue": 0, + "camerainterval": 0.6 + }, + { + "hid": "11011", + "name": { + "key": "11011", + "text": "浣熊" + }, + "star": 4, + "color": 3, + "race": 2, + "job": 2, + "type": 1, + "handbook": 0, + "prefab": 11011, + "icon": 11011, + "sound": { + "key": "11011", + "text": "" + }, + "tujing": [ + 1 + ], + "intr": { + "key": "", + "text": "" + }, + "events": "EventDataSet/Hero_11011.asset", + "cite": "11011", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill": -1, + "skill1": 110111, + "skill2": 110112, + "skill3": 110113, + "txt": { + "key": "", + "text": "" + }, + "enteranivalue": 0, + "camerainterval": 0.6 + }, + { + "hid": "11008", + "name": { + "key": "11008", + "text": "悍娇虎" + }, + "star": 5, + "color": 4, + "race": 2, + "job": 2, + "type": 1, + "handbook": 0, + "prefab": 11008, + "icon": 11008, + "sound": { + "key": "11008", + "text": "" + }, + "tujing": [ + 1 + ], + "intr": { + "key": "", + "text": "" + }, + "events": "EventDataSet/Hero_11008.asset", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill": -1, + "skill1": 110081, + "skill2": 110082, + "skill3": 110083, + "txt": { + "key": "", + "text": "" + }, + "enteranivalue": 0, + "camerainterval": 0.6 + }, + { + "hid": "11017", + "name": { + "key": "11017", + "text": "冰霜杰克" + }, + "star": 5, + "color": 4, + "race": 4, + "job": 2, + "type": 1, + "handbook": 0, + "prefab": 11017, + "icon": 11017, + "sound": { + "key": "11017", + "text": "" + }, + "tujing": [ + 1 + ], + "intr": { + "key": "", + "text": "" + }, + "events": "EventDataSet/Hero_11017.asset", + "cite": "", + "effectstay": [ + "Bone001/Dummy001,Skill/Role/11017/effect_11017_weapon1" + ], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill": -1, + "skill1": 110171, + "skill2": 110172, + "skill3": 110173, + "txt": { + "key": "", + "text": "" + }, + "enteranivalue": 0, + "camerainterval": 0.6 + }, + { + "hid": "11018", + "name": { + "key": "11018", + "text": "睡神" + }, + "star": 5, + "color": 4, + "race": 4, + "job": 2, + "type": 1, + "handbook": 0, + "prefab": 11018, + "icon": 11018, + "sound": { + "key": "11018", + "text": "" + }, + "tujing": [ + 1 + ], + "intr": { + "key": "", + "text": "" + }, + "events": "EventDataSet/Hero_11018.asset", + "cite": "", + "effectstay": [ + "Bip001,Skill/Role/11018/effect_11018_sleep", + "Bip001,Skill/Role/11018/effect_11018_fengsha" + ], + "hpspace": { + "x": 0, + "y": -0.31, + "z": 0 + }, + "skill": -1, + "skill1": 110181, + "skill2": 110182, + "skill3": 110183, + "txt": { + "key": "", + "text": "" + }, + "enteranivalue": 0, + "camerainterval": 0.6 + }, + { + "hid": "11019", + "name": { + "key": "11019", + "text": "莫甘娜" + }, + "star": 5, + "color": 4, + "race": 2, + "job": 2, + "type": 1, + "handbook": 0, + "prefab": 11019, + "icon": 11019, + "sound": { + "key": "11019", + "text": "" + }, + "tujing": [ + 1 + ], + "intr": { + "key": "", + "text": "" + }, + "events": "EventDataSet/Hero_11019.asset", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill": -1, + "skill1": 110191, + "skill2": 110192, + "skill3": 110193, + "txt": { + "key": "", + "text": "" + }, + "enteranivalue": 0, + "camerainterval": 0.6 + }, + { + "hid": "11020", + "name": { + "key": "11020", + "text": "莫甘娜二阶段" + }, + "star": 5, + "color": 4, + "race": 2, + "job": 2, + "type": 1, + "handbook": 0, + "prefab": 11020, + "icon": 11020, + "sound": { + "key": "11020", + "text": "" + }, + "tujing": [ + 1 + ], + "intr": { + "key": "", + "text": "" + }, + "events": "EventDataSet/Hero_11020.asset", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill": -1, + "skill1": 110201, + "skill2": 110202, + "skill3": 110203, + "txt": { + "key": "", + "text": "" + }, + "enteranivalue": 0, + "camerainterval": 0.6 + }, + { + "hid": "11021", + "name": { + "key": "11021", + "text": "莫甘娜巨怪" + }, + "star": 5, + "color": 4, + "race": 2, + "job": 2, + "type": 1, + "handbook": 0, + "prefab": 11021, + "icon": 11021, + "sound": { + "key": "11021", + "text": "" + }, + "tujing": [ + 1 + ], + "intr": { + "key": "", + "text": "" + }, + "events": "EventDataSet/Hero_11021.asset", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill": -1, + "skill1": 110211, + "skill2": 110212, + "skill3": 110213, + "txt": { + "key": "", + "text": "" + }, + "enteranivalue": 0, + "camerainterval": 0.6 + }, + { + "hid": "11099", + "name": { + "key": "11099", + "text": "触手" + }, + "star": 5, + "color": 4, + "race": 2, + "job": 2, + "type": 1, + "handbook": 0, + "prefab": 11099, + "icon": 11099, + "sound": { + "key": "11099", + "text": "" + }, + "tujing": [ + 1 + ], + "intr": { + "key": "", + "text": "" + }, + "events": "EventDataSet/Hero_11099.asset", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill": -1, + "skill1": 110991, + "skill2": 110992, + "skill3": 110993, + "txt": { + "key": "", + "text": "" + }, + "enteranivalue": 0, + "camerainterval": 0.6 + }, + { + "hid": "12001", + "name": { + "key": "12001", + "text": "黑化阿宝" + }, + "star": 5, + "color": 4, + "race": 2, + "job": 2, + "type": 1, + "handbook": 0, + "prefab": 12001, + "icon": 12001, + "sound": { + "key": "121323", + "text": "" + }, + "tujing": [ + 1 + ], + "intr": { + "key": "", + "text": "" + }, + "events": "EventDataSet/Hero_12001.asset", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill": -1, + "skill1": 120011, + "skill2": 120012, + "skill3": 120013, + "txt": { + "key": "", + "text": "" + }, + "enteranivalue": 0, + "camerainterval": 0.6 + }, + { + "hid": "12003", + "name": { + "key": "12003", + "text": "黑化包比" + }, + "star": 5, + "color": 4, + "race": 2, + "job": 2, + "type": 1, + "handbook": 0, + "prefab": 12003, + "icon": 12003, + "sound": { + "key": "12003", + "text": "" + }, + "tujing": [ + 1 + ], + "intr": { + "key": "", + "text": "" + }, + "events": "EventDataSet/Hero_11003.asset", + "cite": "", + "effectstay": [ + "this,Skill/Role/12003/effect_12003_wuqitexiao" + ], + "hpspace": { + "x": 0, + "y": 0.154, + "z": 0 + }, + "skill": -1, + "skill1": 120031, + "skill2": 120032, + "skill3": 120033, + "txt": { + "key": "", + "text": "" + }, + "enteranivalue": 0, + "camerainterval": 0.6 + }, + { + "hid": "12009", + "name": { + "key": "12009", + "text": "黑化希卡普" + }, + "star": 5, + "color": 4, + "race": 2, + "job": 2, + "type": 1, + "handbook": 0, + "prefab": 12009, + "icon": 11009, + "sound": { + "key": "11009", + "text": "" + }, + "tujing": [ + 1 + ], + "intr": { + "key": "", + "text": "" + }, + "events": "EventDataSet/Hero_11009.asset", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill": -1, + "skill1": 120091, + "skill2": 120092, + "skill3": 120093, + "txt": { + "key": "", + "text": "" + }, + "enteranivalue": 0, + "camerainterval": 0.6 + }, + { + "hid": "12017", + "name": { + "key": "12017", + "text": "黑化杰克" + }, + "star": 5, + "color": 4, + "race": 2, + "job": 2, + "type": 1, + "handbook": 0, + "prefab": 12017, + "icon": 12017, + "sound": { + "key": "12017", + "text": "" + }, + "tujing": [ + 1 + ], + "intr": { + "key": "", + "text": "" + }, + "events": "EventDataSet/Hero_11017.asset", + "cite": "", + "effectstay": [ + "Bone001/Dummy001,Skill/Role/12017/effect_12017_weapon1_bad" + ], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill": -1, + "skill1": 120171, + "skill2": 120172, + "skill3": 120173, + "txt": { + "key": "", + "text": "" + }, + "enteranivalue": 0, + "camerainterval": 0.6 + }, + { + "hid": "12018", + "name": { + "key": "12018", + "text": "黑化睡神" + }, + "star": 5, + "color": 4, + "race": 2, + "job": 2, + "type": 1, + "handbook": 0, + "prefab": 12018, + "icon": 12018, + "sound": { + "key": "12018", + "text": "" + }, + "tujing": [ + 1 + ], + "intr": { + "key": "", + "text": "" + }, + "events": "EventDataSet/Hero_11018.asset", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0.26, + "z": 0 + }, + "skill": -1, + "skill1": 120181, + "skill2": 120182, + "skill3": 120183, + "txt": { + "key": "", + "text": "" + }, + "enteranivalue": 0, + "camerainterval": 0.6 + }, + { + "hid": "44005", + "name": { + "key": "44005", + "text": "小伊" + }, + "star": 4, + "color": 4, + "race": 4, + "job": 3, + "type": 1, + "handbook": 0, + "prefab": 44005, + "icon": 44005, + "sound": { + "key": "44005", + "text": "" + }, + "tujing": [ + 1 + ], + "intr": { + "key": "", + "text": "" + }, + "events": "EventDataSet/Hero_44005.asset", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill": -1, + "skill1": 440051, + "skill2": 440052, + "skill3": 440053, + "txt": { + "key": "", + "text": "" + }, + "enteranivalue": 0, + "camerainterval": 0.6 + }, + { + "hid": "15005", + "name": { + "key": "15005", + "text": "亚力克斯" + }, + "star": 5, + "color": 5, + "race": 1, + "job": 3, + "type": 1, + "handbook": 0, + "prefab": 15005, + "icon": 15005, + "sound": { + "key": "15005", + "text": "" + }, + "tujing": [ + 1 + ], + "intr": { + "key": "", + "text": "" + }, + "events": "EventDataSet/Hero_15005.asset", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill": -1, + "skill1": 150051, + "skill2": 150052, + "skill3": 150053, + "txt": { + "key": "", + "text": "" + }, + "enteranivalue": 0, + "camerainterval": 0.6 + }, + { + "hid": "35001", + "name": { + "key": "35001", + "text": "浣熊" + }, + "star": 4, + "color": 4, + "race": 4, + "job": 3, + "type": 1, + "handbook": 0, + "prefab": 35001, + "icon": 35001, + "sound": { + "key": "35001", + "text": "" + }, + "tujing": [ + 1 + ], + "intr": { + "key": "", + "text": "" + }, + "events": "EventDataSet/Hero_35001.asset", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill": -1, + "skill1": 350011, + "skill2": 350012, + "skill3": 350013, + "txt": { + "key": "", + "text": "" + }, + "enteranivalue": 0, + "camerainterval": 0.6 } ] \ No newline at end of file diff --git a/bin/json/game_taskround.json b/bin/json/game_taskround.json index 2decd4d88..00ab0fc4f 100644 --- a/bin/json/game_taskround.json +++ b/bin/json/game_taskround.json @@ -410,7 +410,7 @@ "active": 0, "id_after": 0, "jump_interface": "mainworld", - "icon": "wp_icon_0001", + "icon": "rw_cj_icon01", "reword": [ { "a": "attr", @@ -430,7 +430,7 @@ "active": 0, "id_after": 30102, "jump_interface": "mainworld", - "icon": "rw_cj_icon04", + "icon": "rw_cj_icon02", "reword": [ { "a": "attr", @@ -450,7 +450,7 @@ "active": 0, "id_after": 30103, "jump_interface": "mainworld", - "icon": "rw_cj_icon05", + "icon": "rw_cj_icon09", "reword": [ { "a": "attr", @@ -470,7 +470,7 @@ "active": 0, "id_after": 30104, "jump_interface": "mainworld", - "icon": "rw_cj_icon06", + "icon": "rw_cj_icon10", "reword": [ { "a": "attr", @@ -490,7 +490,7 @@ "active": 0, "id_after": 30105, "jump_interface": "mainworld", - "icon": "rw_cj_icon07", + "icon": "rw_cj_icon11", "reword": [ { "a": "attr", @@ -510,7 +510,7 @@ "active": 0, "id_after": 30106, "jump_interface": "mainworld", - "icon": "rw_cj_icon08", + "icon": "rw_cj_icon12", "reword": [ { "a": "attr", @@ -530,7 +530,7 @@ "active": 0, "id_after": 30107, "jump_interface": "mainworld", - "icon": "rw_cj_icon09", + "icon": "rw_cj_icon13", "reword": [ { "a": "attr", @@ -550,7 +550,7 @@ "active": 0, "id_after": 30108, "jump_interface": "mainworld", - "icon": "rw_cj_icon10", + "icon": "rw_cj_icon14", "reword": [ { "a": "attr", @@ -570,7 +570,7 @@ "active": 0, "id_after": 30109, "jump_interface": "mainworld", - "icon": "rw_cj_icon11", + "icon": "rw_cj_icon15", "reword": [ { "a": "attr", @@ -590,7 +590,7 @@ "active": 0, "id_after": 30110, "jump_interface": "mainworld", - "icon": "rw_cj_icon12", + "icon": "rw_cj_icon16", "reword": [ { "a": "attr", @@ -610,7 +610,7 @@ "active": 0, "id_after": 30111, "jump_interface": "mainworld", - "icon": "rw_cj_icon13", + "icon": "rw_cj_icon17", "reword": [ { "a": "attr", @@ -630,7 +630,7 @@ "active": 0, "id_after": 30112, "jump_interface": "mainworld", - "icon": "rw_cj_icon14", + "icon": "rw_cj_icon18", "reword": [ { "a": "attr", @@ -650,7 +650,7 @@ "active": 0, "id_after": 30113, "jump_interface": "mainworld", - "icon": "rw_cj_icon15", + "icon": "rw_cj_icon01", "reword": [ { "a": "attr", @@ -670,7 +670,7 @@ "active": 0, "id_after": 30114, "jump_interface": "mainworld", - "icon": "rw_cj_icon16", + "icon": "rw_cj_icon02", "reword": [ { "a": "attr", @@ -690,7 +690,7 @@ "active": 0, "id_after": 30115, "jump_interface": "mainworld", - "icon": "rw_cj_icon17", + "icon": "rw_cj_icon09", "reword": [ { "a": "attr", @@ -710,7 +710,7 @@ "active": 0, "id_after": 30116, "jump_interface": "mainworld", - "icon": "rw_cj_icon18", + "icon": "rw_cj_icon10", "reword": [ { "a": "attr", @@ -730,7 +730,7 @@ "active": 0, "id_after": 30117, "jump_interface": "mainworld", - "icon": "rw_cj_icon01", + "icon": "rw_cj_icon11", "reword": [ { "a": "attr", @@ -750,7 +750,7 @@ "active": 0, "id_after": 30118, "jump_interface": "mainworld", - "icon": "rw_cj_icon02", + "icon": "rw_cj_icon12", "reword": [ { "a": "attr", @@ -770,7 +770,7 @@ "active": 0, "id_after": 30119, "jump_interface": "mainworld", - "icon": "rw_cj_icon03", + "icon": "rw_cj_icon13", "reword": [ { "a": "attr", @@ -790,7 +790,7 @@ "active": 0, "id_after": 0, "jump_interface": "mainworld", - "icon": "rw_cj_icon04", + "icon": "rw_cj_icon14", "reword": [ { "a": "attr", @@ -810,7 +810,7 @@ "active": 0, "id_after": 0, "jump_interface": "mainworld", - "icon": "rw_cj_icon05", + "icon": "rw_cj_icon15", "reword": [ { "a": "attr", @@ -830,7 +830,7 @@ "active": 0, "id_after": 0, "jump_interface": "mainworld", - "icon": "rw_cj_icon06", + "icon": "rw_cj_icon16", "reword": [ { "a": "attr", @@ -850,7 +850,7 @@ "active": 0, "id_after": 0, "jump_interface": "mainworld", - "icon": "rw_cj_icon07", + "icon": "rw_cj_icon17", "reword": [ { "a": "attr", diff --git a/cmd/robot/hero.go b/cmd/robot/hero.go index 13d1da273..433bd7e89 100644 --- a/cmd/robot/hero.go +++ b/cmd/robot/hero.go @@ -53,7 +53,7 @@ var ( mainType: string(comm.ModuleHero), subType: hero.HeroSubTypeChouka, req: &pb.HeroChoukaReq{ - HeroIds: []int32{14001, 14002, 14003, 14004, 14005, 14006, 14007}, + HeroIds: []string{"14001"}, }, rsp: &pb.HeroChoukaResp{}, // enabled: true, diff --git a/modules/comp_configure.go b/modules/comp_configure.go index 476d02fe3..985ef3880 100644 --- a/modules/comp_configure.go +++ b/modules/comp_configure.go @@ -13,6 +13,7 @@ const ( game_global = "game_global.json" //全局配置表 game_initial = "game_initial.json" //初始化表 game_playerlv = "game_playerlv.json" //玩家等级 + // 形象配置表 ) ///配置管理基础组件 @@ -106,6 +107,7 @@ func (this *MCompConfigure) GetPlayerlvConfList() (list []*cfg.Game_playerlvData return } +// 玩家等级经验配置表 func (this *MCompConfigure) GetPlayerlvConf(lv int32) (data *cfg.Game_playerlvData) { if v, err := this.GetConfigure(game_playerlv); err != nil { return @@ -121,3 +123,4 @@ func (this *MCompConfigure) GetPlayerlvConf(lv int32) (data *cfg.Game_playerlvDa } return } + diff --git a/modules/user/api.go b/modules/user/api.go index 7e8219fc1..c736ef178 100644 --- a/modules/user/api.go +++ b/modules/user/api.go @@ -20,6 +20,7 @@ const ( UserGetTujianResp = "gettujian" //获取图鉴信息 UserSubTypeLvChangedPush = "lvChangedPush" //等级变化推送 UserSubTypeModifyName = "modifyname" //修改名称 + UserSubTypeFigure = "figure" //形象 ) type apiComp struct { diff --git a/modules/user/api_figure.go b/modules/user/api_figure.go new file mode 100644 index 000000000..6eb72fc5a --- /dev/null +++ b/modules/user/api_figure.go @@ -0,0 +1,94 @@ +package user + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" + "go_dreamfactory/utils" + + "google.golang.org/protobuf/proto" +) + +// 主角形象设置 + +func (this *apiComp) FigureCheck(session comm.IUserSession, req *pb.UserFigureReq) (code pb.ErrorCode) { + if req.Preinstall < 1 || req.Preinstall > 5 || req.Action < 0 || + req.Hair == nil || req.Eyes == nil || req.Mouth == nil || req.Body == nil || req.Complexion == nil { + code = pb.ErrorCode_ReqParameterError + } + return +} + +func (this *apiComp) Figure(session comm.IUserSession, req *pb.UserFigureReq) (code pb.ErrorCode, data proto.Message) { + if code = this.FigureCheck(session, req); code != pb.ErrorCode_Success { + return + } + + expand, err := this.module.modelUser.GetUserExpand(session.GetUserId()) + if err != nil { + code = pb.ErrorCode_DBError + return + } + + //当前形象 + var curFigure *pb.Figure + if v, ok := expand.Preinstall[req.Preinstall]; ok { + curFigure = v + } else { + //TODO 设置默认形象 + curFigure = &pb.Figure{} + return + } + + rsp := &pb.UserFigureResp{ + Uid: session.GetUserId(), + Action: req.Action, + } + + if req.Action == 0 { + //直接返回预设形象 + rsp.Figure = curFigure + } else { + update := make(map[string]interface{}) + switch req.Action { + // 头发 + case 1: + if req.Hair != nil { + curFigure.Hair = req.Hair + } + // 眼睛 + case 2: + if req.Eyes != nil { + curFigure.Eyes = req.Eyes + } + // 嘴巴 + case 3: + if req.Mouth != nil { + curFigure.Mouth = req.Mouth + } + // 体型 + case 4: + if req.Body != nil { + curFigure.Body = req.Body + } + // 肤色 + case 5: + if req.Complexion != nil { + curFigure.Complexion = req.Complexion + } + default: + code = pb.ErrorCode_ReqParameterError + return + } + + update = utils.StructToMap(curFigure) + + this.module.modelUser.ChanageUserExpand(session.GetUserId(), update) + } + + if err := session.SendMsg(string(this.module.GetType()), UserSubTypeFigure, rsp); err != nil { + code = pb.ErrorCode_SystemError + return + } + + return +} diff --git a/modules/user/api_initdata.go b/modules/user/api_initdata.go index b59001c0a..988fa444c 100644 --- a/modules/user/api_initdata.go +++ b/modules/user/api_initdata.go @@ -20,7 +20,9 @@ func (this *apiComp) Initdata(session comm.IUserSession, req *pb.UserInitdataReq return } - rsp := &pb.UserInitdataResp{} + rsp := &pb.UserInitdataResp{ + Uid: session.GetUserId(), + } defer func() { if err := session.SendMsg(string(this.module.GetType()), UserSubTypeInitData, rsp); err != nil { diff --git a/modules/user/model_user.go b/modules/user/model_user.go index 2a5cd7c5a..b14876b15 100644 --- a/modules/user/model_user.go +++ b/modules/user/model_user.go @@ -133,6 +133,8 @@ func (this *ModelUser) modifyName(uid string, newName string) (code pb.ErrorCode return } +// 默认 + // change exp func (this *ModelUser) ChangeExp(event interface{}, next func(event interface{})) { ul := event.(*UserListen) diff --git a/pb/proto/user/user_msg.proto b/pb/proto/user/user_msg.proto index b0f793289..4f7d51871 100644 --- a/pb/proto/user/user_msg.proto +++ b/pb/proto/user/user_msg.proto @@ -70,7 +70,7 @@ message UserGetSettingResp { // 更新用户设置 message UserUpdateSettingReq { DBUserSetting setting = 1; } -message UserUpdateSettingResp {} +message UserUpdateSettingResp { string uid = 1; } // 初始化验证码 message UserVeriCodeReq {} @@ -82,7 +82,7 @@ message UserVeriCodeResp { message UserInitdataReq { int32 code = 1; //验证码 } -message UserInitdataResp {} +message UserInitdataResp { string uid = 1; } //修改玩家名字 message UserModifynameReq { @@ -102,4 +102,21 @@ message UserChangedPush { string uid = 1; int32 exp = 2; int32 lv = 3; +} + +//主角形象 +message UserFigureReq { + int32 preinstall = 1; //预设编号 1-5 + int32 action = 2; //部位 1-5 0不修改任何数据 + Hair hair = 3; //部位 1 + Eyes eyes = 4; //部位 2 + Mouth mouth = 5; //部位 3 + Body body = 6; //部位 4 + Complexion complexion = 7; //部位 5 +} + +message UserFigureResp { + string uid = 1; + int32 action = 2; //部位 + Figure figure = 3; } \ No newline at end of file diff --git a/pb/proto/userexpand.proto b/pb/proto/userexpand.proto index a04842f5b..70cdf794f 100644 --- a/pb/proto/userexpand.proto +++ b/pb/proto/userexpand.proto @@ -1,14 +1,53 @@ syntax = "proto3"; option go_package = ".;pb"; +// 发型 +message Hair { + int32 resId = 1; //资源ID + string color = 2; //颜色 +} + +// 眼睛 +message Eyes { + int32 resId = 1; //资源ID + string color = 2; //颜色 +} + +// 嘴巴 +message Mouth { + string resId = 1; //资源ID +} + +// 身体 +message Body { + int32 high = 1; //身高 + int32 shape = 2; //体型 +} + +// 肤色 +message Complexion { + string color = 1; //颜色值 +} + +// 形象 +message Figure { + Hair hair = 1; + Eyes eyes = 2; + Mouth mouth = 3; + Body body = 4; + Complexion complexion = 5; +} + //用户扩展数据 message DBUserExpand { - string id = 1; //主键id - string uid = 2; //用户id - int64 lastreadnotiftime = 3; //最后阅读公告时间 - int64 lastInitdataTime = 4; //上次初始数据时间 - uint32 initdataCount = 5; //今日初始累计次数 - int32 chatchannel = 6; //跨服聊天频道 - int32 modifynameCount = 7; //修改昵称次数 - map tujian = 8; // 图鉴 + string id = 1; //主键id + string uid = 2; //用户id + int64 lastreadnotiftime = 3; //最后阅读公告时间 + int64 lastInitdataTime = 4; //上次初始数据时间 + uint32 initdataCount = 5; //今日初始累计次数 + int32 chatchannel = 6; //跨服聊天频道 + int32 modifynameCount = 7; //修改昵称次数 + map tujian = 8; // 图鉴 + int32 curFigure = 9; //当前形象 + map preinstall = 10; //形象预设 } diff --git a/pb/user_msg.pb.go b/pb/user_msg.pb.go index 0f5ecea43..5cd7dc3d5 100644 --- a/pb/user_msg.pb.go +++ b/pb/user_msg.pb.go @@ -774,6 +774,8 @@ type UserUpdateSettingResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields + + Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` } func (x *UserUpdateSettingResp) Reset() { @@ -808,6 +810,13 @@ func (*UserUpdateSettingResp) Descriptor() ([]byte, []int) { return file_user_user_msg_proto_rawDescGZIP(), []int{15} } +func (x *UserUpdateSettingResp) GetUid() string { + if x != nil { + return x.Uid + } + return "" +} + // 初始化验证码 type UserVeriCodeReq struct { state protoimpl.MessageState @@ -946,6 +955,8 @@ type UserInitdataResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields + + Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` } func (x *UserInitdataResp) Reset() { @@ -980,6 +991,13 @@ func (*UserInitdataResp) Descriptor() ([]byte, []int) { return file_user_user_msg_proto_rawDescGZIP(), []int{19} } +func (x *UserInitdataResp) GetUid() string { + if x != nil { + return x.Uid + } + return "" +} + //修改玩家名字 type UserModifynameReq struct { state protoimpl.MessageState @@ -1233,6 +1251,165 @@ func (x *UserChangedPush) GetLv() int32 { return 0 } +//主角形象 +type UserFigureReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Preinstall int32 `protobuf:"varint,1,opt,name=preinstall,proto3" json:"preinstall"` //预设编号 1-5 + Action int32 `protobuf:"varint,2,opt,name=action,proto3" json:"action"` //部位 1-5 0不修改任何数据 + Hair *Hair `protobuf:"bytes,3,opt,name=hair,proto3" json:"hair"` //部位 1 + Eyes *Eyes `protobuf:"bytes,4,opt,name=eyes,proto3" json:"eyes"` //部位 2 + Mouth *Mouth `protobuf:"bytes,5,opt,name=mouth,proto3" json:"mouth"` //部位 3 + Body *Body `protobuf:"bytes,6,opt,name=body,proto3" json:"body"` //部位 4 + Complexion *Complexion `protobuf:"bytes,7,opt,name=complexion,proto3" json:"complexion"` //部位 5 +} + +func (x *UserFigureReq) Reset() { + *x = UserFigureReq{} + if protoimpl.UnsafeEnabled { + mi := &file_user_user_msg_proto_msgTypes[25] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *UserFigureReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UserFigureReq) ProtoMessage() {} + +func (x *UserFigureReq) ProtoReflect() protoreflect.Message { + mi := &file_user_user_msg_proto_msgTypes[25] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UserFigureReq.ProtoReflect.Descriptor instead. +func (*UserFigureReq) Descriptor() ([]byte, []int) { + return file_user_user_msg_proto_rawDescGZIP(), []int{25} +} + +func (x *UserFigureReq) GetPreinstall() int32 { + if x != nil { + return x.Preinstall + } + return 0 +} + +func (x *UserFigureReq) GetAction() int32 { + if x != nil { + return x.Action + } + return 0 +} + +func (x *UserFigureReq) GetHair() *Hair { + if x != nil { + return x.Hair + } + return nil +} + +func (x *UserFigureReq) GetEyes() *Eyes { + if x != nil { + return x.Eyes + } + return nil +} + +func (x *UserFigureReq) GetMouth() *Mouth { + if x != nil { + return x.Mouth + } + return nil +} + +func (x *UserFigureReq) GetBody() *Body { + if x != nil { + return x.Body + } + return nil +} + +func (x *UserFigureReq) GetComplexion() *Complexion { + if x != nil { + return x.Complexion + } + return nil +} + +type UserFigureResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` + Action int32 `protobuf:"varint,2,opt,name=action,proto3" json:"action"` //部位 + Figure *Figure `protobuf:"bytes,3,opt,name=figure,proto3" json:"figure"` +} + +func (x *UserFigureResp) Reset() { + *x = UserFigureResp{} + if protoimpl.UnsafeEnabled { + mi := &file_user_user_msg_proto_msgTypes[26] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *UserFigureResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UserFigureResp) ProtoMessage() {} + +func (x *UserFigureResp) ProtoReflect() protoreflect.Message { + mi := &file_user_user_msg_proto_msgTypes[26] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UserFigureResp.ProtoReflect.Descriptor instead. +func (*UserFigureResp) Descriptor() ([]byte, []int) { + return file_user_user_msg_proto_rawDescGZIP(), []int{26} +} + +func (x *UserFigureResp) GetUid() string { + if x != nil { + return x.Uid + } + return "" +} + +func (x *UserFigureResp) GetAction() int32 { + if x != nil { + return x.Action + } + return 0 +} + +func (x *UserFigureResp) GetFigure() *Figure { + if x != nil { + return x.Figure + } + return nil +} + var File_user_user_msg_proto protoreflect.FileDescriptor var file_user_user_msg_proto_rawDesc = []byte{ @@ -1292,32 +1469,54 @@ var file_user_user_msg_proto_rawDesc = []byte{ 0x61, 0x74, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x12, 0x28, 0x0a, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x07, - 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x22, 0x17, 0x0a, 0x15, 0x55, 0x73, 0x65, 0x72, 0x55, + 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x22, 0x29, 0x0a, 0x15, 0x55, 0x73, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, - 0x22, 0x11, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x43, 0x6f, 0x64, 0x65, - 0x52, 0x65, 0x71, 0x22, 0x26, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x43, - 0x6f, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x25, 0x0a, 0x0f, 0x55, - 0x73, 0x65, 0x72, 0x49, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x12, 0x12, - 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, - 0x64, 0x65, 0x22, 0x12, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x69, 0x74, 0x64, 0x61, - 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, - 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x6e, - 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, - 0x3c, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, - 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x12, 0x0a, - 0x10, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x52, 0x65, - 0x71, 0x22, 0x2d, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x54, 0x75, 0x6a, 0x69, - 0x61, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, - 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x73, - 0x22, 0x45, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, - 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, + 0x69, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x43, 0x6f, + 0x64, 0x65, 0x52, 0x65, 0x71, 0x22, 0x26, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72, + 0x69, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, + 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x25, 0x0a, + 0x0f, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, + 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, + 0x63, 0x6f, 0x64, 0x65, 0x22, 0x24, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x69, 0x74, + 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73, + 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x12, + 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, + 0x61, 0x6d, 0x65, 0x22, 0x3c, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, + 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, + 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x22, 0x12, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x54, 0x75, 0x6a, 0x69, + 0x61, 0x6e, 0x52, 0x65, 0x71, 0x22, 0x2d, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, + 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, + 0x72, 0x6f, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, + 0x6f, 0x69, 0x64, 0x73, 0x22, 0x45, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, + 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x6c, + 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0xe3, 0x01, 0x0a, 0x0d, + 0x55, 0x73, 0x65, 0x72, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, + 0x0a, 0x70, 0x72, 0x65, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x0a, 0x70, 0x72, 0x65, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x12, 0x16, 0x0a, + 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x19, 0x0a, 0x04, 0x68, 0x61, 0x69, 0x72, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x48, 0x61, 0x69, 0x72, 0x52, 0x04, 0x68, 0x61, 0x69, 0x72, + 0x12, 0x19, 0x0a, 0x04, 0x65, 0x79, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x05, + 0x2e, 0x45, 0x79, 0x65, 0x73, 0x52, 0x04, 0x65, 0x79, 0x65, 0x73, 0x12, 0x1c, 0x0a, 0x05, 0x6d, + 0x6f, 0x75, 0x74, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x4d, 0x6f, 0x75, + 0x74, 0x68, 0x52, 0x05, 0x6d, 0x6f, 0x75, 0x74, 0x68, 0x12, 0x19, 0x0a, 0x04, 0x62, 0x6f, 0x64, + 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x42, 0x6f, 0x64, 0x79, 0x52, 0x04, + 0x62, 0x6f, 0x64, 0x79, 0x12, 0x2b, 0x0a, 0x0a, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x69, + 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x6c, + 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x69, 0x6f, + 0x6e, 0x22, 0x5b, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1f, 0x0a, + 0x06, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, + 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x06, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x42, 0x06, + 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1332,7 +1531,7 @@ func file_user_user_msg_proto_rawDescGZIP() []byte { return file_user_user_msg_proto_rawDescData } -var file_user_user_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 25) +var file_user_user_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 27) var file_user_user_msg_proto_goTypes = []interface{}{ (*UserLoginReq)(nil), // 0: UserLoginReq (*UserLoginResp)(nil), // 1: UserLoginResp @@ -1359,27 +1558,41 @@ var file_user_user_msg_proto_goTypes = []interface{}{ (*UserGetTujianReq)(nil), // 22: UserGetTujianReq (*UserGetTujianResp)(nil), // 23: UserGetTujianResp (*UserChangedPush)(nil), // 24: UserChangedPush - (*DBUser)(nil), // 25: DBUser - (*DBUserExpand)(nil), // 26: DBUserExpand - (ErrorCode)(0), // 27: ErrorCode - (*CacheUser)(nil), // 28: CacheUser - (*UserAssets)(nil), // 29: UserAssets - (*DBUserSetting)(nil), // 30: DBUserSetting + (*UserFigureReq)(nil), // 25: UserFigureReq + (*UserFigureResp)(nil), // 26: UserFigureResp + (*DBUser)(nil), // 27: DBUser + (*DBUserExpand)(nil), // 28: DBUserExpand + (ErrorCode)(0), // 29: ErrorCode + (*CacheUser)(nil), // 30: CacheUser + (*UserAssets)(nil), // 31: UserAssets + (*DBUserSetting)(nil), // 32: DBUserSetting + (*Hair)(nil), // 33: Hair + (*Eyes)(nil), // 34: Eyes + (*Mouth)(nil), // 35: Mouth + (*Body)(nil), // 36: Body + (*Complexion)(nil), // 37: Complexion + (*Figure)(nil), // 38: Figure } var file_user_user_msg_proto_depIdxs = []int32{ - 25, // 0: UserLoginResp.data:type_name -> DBUser - 26, // 1: UserLoginResp.ex:type_name -> DBUserExpand - 27, // 2: UserRegisterResp.Code:type_name -> ErrorCode - 28, // 3: UserLoadResp.data:type_name -> CacheUser - 29, // 4: UserAddResReq.res:type_name -> UserAssets - 29, // 5: UserAddResResp.res:type_name -> UserAssets - 30, // 6: UserGetSettingResp.setting:type_name -> DBUserSetting - 30, // 7: UserUpdateSettingReq.setting:type_name -> DBUserSetting - 8, // [8:8] is the sub-list for method output_type - 8, // [8:8] is the sub-list for method input_type - 8, // [8:8] is the sub-list for extension type_name - 8, // [8:8] is the sub-list for extension extendee - 0, // [0:8] is the sub-list for field type_name + 27, // 0: UserLoginResp.data:type_name -> DBUser + 28, // 1: UserLoginResp.ex:type_name -> DBUserExpand + 29, // 2: UserRegisterResp.Code:type_name -> ErrorCode + 30, // 3: UserLoadResp.data:type_name -> CacheUser + 31, // 4: UserAddResReq.res:type_name -> UserAssets + 31, // 5: UserAddResResp.res:type_name -> UserAssets + 32, // 6: UserGetSettingResp.setting:type_name -> DBUserSetting + 32, // 7: UserUpdateSettingReq.setting:type_name -> DBUserSetting + 33, // 8: UserFigureReq.hair:type_name -> Hair + 34, // 9: UserFigureReq.eyes:type_name -> Eyes + 35, // 10: UserFigureReq.mouth:type_name -> Mouth + 36, // 11: UserFigureReq.body:type_name -> Body + 37, // 12: UserFigureReq.complexion:type_name -> Complexion + 38, // 13: UserFigureResp.figure:type_name -> Figure + 14, // [14:14] is the sub-list for method output_type + 14, // [14:14] is the sub-list for method input_type + 14, // [14:14] is the sub-list for extension type_name + 14, // [14:14] is the sub-list for extension extendee + 0, // [0:14] is the sub-list for field type_name } func init() { file_user_user_msg_proto_init() } @@ -1692,6 +1905,30 @@ func file_user_user_msg_proto_init() { return nil } } + file_user_user_msg_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*UserFigureReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_user_user_msg_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*UserFigureResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -1699,7 +1936,7 @@ func file_user_user_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_user_user_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 25, + NumMessages: 27, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/userexpand.pb.go b/pb/userexpand.pb.go index c1fecda2e..b38281522 100644 --- a/pb/userexpand.pb.go +++ b/pb/userexpand.pb.go @@ -20,26 +20,372 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// 发型 +type Hair struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ResId int32 `protobuf:"varint,1,opt,name=resId,proto3" json:"resId"` //资源ID + Color string `protobuf:"bytes,2,opt,name=color,proto3" json:"color"` //颜色 +} + +func (x *Hair) Reset() { + *x = Hair{} + if protoimpl.UnsafeEnabled { + mi := &file_userexpand_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Hair) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Hair) ProtoMessage() {} + +func (x *Hair) ProtoReflect() protoreflect.Message { + mi := &file_userexpand_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Hair.ProtoReflect.Descriptor instead. +func (*Hair) Descriptor() ([]byte, []int) { + return file_userexpand_proto_rawDescGZIP(), []int{0} +} + +func (x *Hair) GetResId() int32 { + if x != nil { + return x.ResId + } + return 0 +} + +func (x *Hair) GetColor() string { + if x != nil { + return x.Color + } + return "" +} + +// 眼睛 +type Eyes struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ResId int32 `protobuf:"varint,1,opt,name=resId,proto3" json:"resId"` //资源ID + Color string `protobuf:"bytes,2,opt,name=color,proto3" json:"color"` //颜色 +} + +func (x *Eyes) Reset() { + *x = Eyes{} + if protoimpl.UnsafeEnabled { + mi := &file_userexpand_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Eyes) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Eyes) ProtoMessage() {} + +func (x *Eyes) ProtoReflect() protoreflect.Message { + mi := &file_userexpand_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Eyes.ProtoReflect.Descriptor instead. +func (*Eyes) Descriptor() ([]byte, []int) { + return file_userexpand_proto_rawDescGZIP(), []int{1} +} + +func (x *Eyes) GetResId() int32 { + if x != nil { + return x.ResId + } + return 0 +} + +func (x *Eyes) GetColor() string { + if x != nil { + return x.Color + } + return "" +} + +// 嘴巴 +type Mouth struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ResId string `protobuf:"bytes,1,opt,name=resId,proto3" json:"resId"` //资源ID +} + +func (x *Mouth) Reset() { + *x = Mouth{} + if protoimpl.UnsafeEnabled { + mi := &file_userexpand_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Mouth) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Mouth) ProtoMessage() {} + +func (x *Mouth) ProtoReflect() protoreflect.Message { + mi := &file_userexpand_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Mouth.ProtoReflect.Descriptor instead. +func (*Mouth) Descriptor() ([]byte, []int) { + return file_userexpand_proto_rawDescGZIP(), []int{2} +} + +func (x *Mouth) GetResId() string { + if x != nil { + return x.ResId + } + return "" +} + +// 身体 +type Body struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + High int32 `protobuf:"varint,1,opt,name=high,proto3" json:"high"` //身高 + Shape int32 `protobuf:"varint,2,opt,name=shape,proto3" json:"shape"` //体型 +} + +func (x *Body) Reset() { + *x = Body{} + if protoimpl.UnsafeEnabled { + mi := &file_userexpand_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Body) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Body) ProtoMessage() {} + +func (x *Body) ProtoReflect() protoreflect.Message { + mi := &file_userexpand_proto_msgTypes[3] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Body.ProtoReflect.Descriptor instead. +func (*Body) Descriptor() ([]byte, []int) { + return file_userexpand_proto_rawDescGZIP(), []int{3} +} + +func (x *Body) GetHigh() int32 { + if x != nil { + return x.High + } + return 0 +} + +func (x *Body) GetShape() int32 { + if x != nil { + return x.Shape + } + return 0 +} + +// 肤色 +type Complexion struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Color string `protobuf:"bytes,1,opt,name=color,proto3" json:"color"` //颜色值 +} + +func (x *Complexion) Reset() { + *x = Complexion{} + if protoimpl.UnsafeEnabled { + mi := &file_userexpand_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Complexion) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Complexion) ProtoMessage() {} + +func (x *Complexion) ProtoReflect() protoreflect.Message { + mi := &file_userexpand_proto_msgTypes[4] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Complexion.ProtoReflect.Descriptor instead. +func (*Complexion) Descriptor() ([]byte, []int) { + return file_userexpand_proto_rawDescGZIP(), []int{4} +} + +func (x *Complexion) GetColor() string { + if x != nil { + return x.Color + } + return "" +} + +// 形象 +type Figure struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Hair *Hair `protobuf:"bytes,1,opt,name=hair,proto3" json:"hair"` + Eyes *Eyes `protobuf:"bytes,2,opt,name=eyes,proto3" json:"eyes"` + Mouth *Mouth `protobuf:"bytes,3,opt,name=mouth,proto3" json:"mouth"` + Body *Body `protobuf:"bytes,4,opt,name=body,proto3" json:"body"` + Complexion *Complexion `protobuf:"bytes,5,opt,name=complexion,proto3" json:"complexion"` +} + +func (x *Figure) Reset() { + *x = Figure{} + if protoimpl.UnsafeEnabled { + mi := &file_userexpand_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Figure) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Figure) ProtoMessage() {} + +func (x *Figure) ProtoReflect() protoreflect.Message { + mi := &file_userexpand_proto_msgTypes[5] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Figure.ProtoReflect.Descriptor instead. +func (*Figure) Descriptor() ([]byte, []int) { + return file_userexpand_proto_rawDescGZIP(), []int{5} +} + +func (x *Figure) GetHair() *Hair { + if x != nil { + return x.Hair + } + return nil +} + +func (x *Figure) GetEyes() *Eyes { + if x != nil { + return x.Eyes + } + return nil +} + +func (x *Figure) GetMouth() *Mouth { + if x != nil { + return x.Mouth + } + return nil +} + +func (x *Figure) GetBody() *Body { + if x != nil { + return x.Body + } + return nil +} + +func (x *Figure) GetComplexion() *Complexion { + if x != nil { + return x.Complexion + } + return nil +} + //用户扩展数据 type DBUserExpand struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id"` //主键id - Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` //用户id - Lastreadnotiftime int64 `protobuf:"varint,3,opt,name=lastreadnotiftime,proto3" json:"lastreadnotiftime"` //最后阅读公告时间 - LastInitdataTime int64 `protobuf:"varint,4,opt,name=lastInitdataTime,proto3" json:"lastInitdataTime"` //上次初始数据时间 - InitdataCount uint32 `protobuf:"varint,5,opt,name=initdataCount,proto3" json:"initdataCount"` //今日初始累计次数 - Chatchannel int32 `protobuf:"varint,6,opt,name=chatchannel,proto3" json:"chatchannel"` //跨服聊天频道 - ModifynameCount int32 `protobuf:"varint,7,opt,name=modifynameCount,proto3" json:"modifynameCount"` //修改昵称次数 - Tujian map[string]bool `protobuf:"bytes,8,rep,name=tujian,proto3" json:"tujian" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 图鉴 + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id"` //主键id + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` //用户id + Lastreadnotiftime int64 `protobuf:"varint,3,opt,name=lastreadnotiftime,proto3" json:"lastreadnotiftime"` //最后阅读公告时间 + LastInitdataTime int64 `protobuf:"varint,4,opt,name=lastInitdataTime,proto3" json:"lastInitdataTime"` //上次初始数据时间 + InitdataCount uint32 `protobuf:"varint,5,opt,name=initdataCount,proto3" json:"initdataCount"` //今日初始累计次数 + Chatchannel int32 `protobuf:"varint,6,opt,name=chatchannel,proto3" json:"chatchannel"` //跨服聊天频道 + ModifynameCount int32 `protobuf:"varint,7,opt,name=modifynameCount,proto3" json:"modifynameCount"` //修改昵称次数 + Tujian map[string]bool `protobuf:"bytes,8,rep,name=tujian,proto3" json:"tujian" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 图鉴 + CurFigure int32 `protobuf:"varint,9,opt,name=curFigure,proto3" json:"curFigure"` //当前形象 + Preinstall map[int32]*Figure `protobuf:"bytes,10,rep,name=preinstall,proto3" json:"preinstall" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //形象预设 } func (x *DBUserExpand) Reset() { *x = DBUserExpand{} if protoimpl.UnsafeEnabled { - mi := &file_userexpand_proto_msgTypes[0] + mi := &file_userexpand_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -52,7 +398,7 @@ func (x *DBUserExpand) String() string { func (*DBUserExpand) ProtoMessage() {} func (x *DBUserExpand) ProtoReflect() protoreflect.Message { - mi := &file_userexpand_proto_msgTypes[0] + mi := &file_userexpand_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -65,7 +411,7 @@ func (x *DBUserExpand) ProtoReflect() protoreflect.Message { // Deprecated: Use DBUserExpand.ProtoReflect.Descriptor instead. func (*DBUserExpand) Descriptor() ([]byte, []int) { - return file_userexpand_proto_rawDescGZIP(), []int{0} + return file_userexpand_proto_rawDescGZIP(), []int{6} } func (x *DBUserExpand) GetId() string { @@ -124,34 +470,83 @@ func (x *DBUserExpand) GetTujian() map[string]bool { return nil } +func (x *DBUserExpand) GetCurFigure() int32 { + if x != nil { + return x.CurFigure + } + return 0 +} + +func (x *DBUserExpand) GetPreinstall() map[int32]*Figure { + if x != nil { + return x.Preinstall + } + return nil +} + var File_userexpand_proto protoreflect.FileDescriptor var file_userexpand_proto_rawDesc = []byte{ 0x0a, 0x10, 0x75, 0x73, 0x65, 0x72, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x22, 0xea, 0x02, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, - 0x61, 0x6e, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2c, 0x0a, 0x11, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x61, - 0x64, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x11, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x61, 0x64, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x74, - 0x69, 0x6d, 0x65, 0x12, 0x2a, 0x0a, 0x10, 0x6c, 0x61, 0x73, 0x74, 0x49, 0x6e, 0x69, 0x74, 0x64, - 0x61, 0x74, 0x61, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x6c, - 0x61, 0x73, 0x74, 0x49, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x54, 0x69, 0x6d, 0x65, 0x12, - 0x24, 0x0a, 0x0d, 0x69, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x43, 0x6f, 0x75, 0x6e, 0x74, - 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0d, 0x69, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, - 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x68, 0x61, 0x74, 0x63, 0x68, 0x61, - 0x6e, 0x6e, 0x65, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x68, 0x61, 0x74, - 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x6d, 0x6f, 0x64, 0x69, 0x66, - 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x0f, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x43, 0x6f, 0x75, 0x6e, - 0x74, 0x12, 0x31, 0x0a, 0x06, 0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x18, 0x08, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x2e, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x75, - 0x6a, 0x69, 0x61, 0x6e, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, - 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x74, 0x6f, 0x22, 0x32, 0x0a, 0x04, 0x48, 0x61, 0x69, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x65, + 0x73, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x65, 0x73, 0x49, 0x64, + 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x05, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x22, 0x32, 0x0a, 0x04, 0x45, 0x79, 0x65, 0x73, 0x12, 0x14, + 0x0a, 0x05, 0x72, 0x65, 0x73, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, + 0x65, 0x73, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x22, 0x1d, 0x0a, 0x05, 0x4d, 0x6f, + 0x75, 0x74, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x65, 0x73, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x05, 0x72, 0x65, 0x73, 0x49, 0x64, 0x22, 0x30, 0x0a, 0x04, 0x42, 0x6f, 0x64, + 0x79, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x69, 0x67, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x04, 0x68, 0x69, 0x67, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x68, 0x61, 0x70, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x68, 0x61, 0x70, 0x65, 0x22, 0x22, 0x0a, 0x0a, 0x43, + 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x6c, + 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x22, + 0xa4, 0x01, 0x0a, 0x06, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x12, 0x19, 0x0a, 0x04, 0x68, 0x61, + 0x69, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x48, 0x61, 0x69, 0x72, 0x52, + 0x04, 0x68, 0x61, 0x69, 0x72, 0x12, 0x19, 0x0a, 0x04, 0x65, 0x79, 0x65, 0x73, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x45, 0x79, 0x65, 0x73, 0x52, 0x04, 0x65, 0x79, 0x65, 0x73, + 0x12, 0x1c, 0x0a, 0x05, 0x6d, 0x6f, 0x75, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x06, 0x2e, 0x4d, 0x6f, 0x75, 0x74, 0x68, 0x52, 0x05, 0x6d, 0x6f, 0x75, 0x74, 0x68, 0x12, 0x19, + 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x42, + 0x6f, 0x64, 0x79, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x12, 0x2b, 0x0a, 0x0a, 0x63, 0x6f, 0x6d, + 0x70, 0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, + 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x63, 0x6f, 0x6d, 0x70, + 0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x22, 0x8f, 0x04, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, + 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2c, 0x0a, 0x11, 0x6c, 0x61, 0x73, + 0x74, 0x72, 0x65, 0x61, 0x64, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x11, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x61, 0x64, 0x6e, 0x6f, + 0x74, 0x69, 0x66, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x2a, 0x0a, 0x10, 0x6c, 0x61, 0x73, 0x74, 0x49, + 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x10, 0x6c, 0x61, 0x73, 0x74, 0x49, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x54, + 0x69, 0x6d, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x69, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x43, + 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0d, 0x69, 0x6e, 0x69, 0x74, + 0x64, 0x61, 0x74, 0x61, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x68, 0x61, + 0x74, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, + 0x63, 0x68, 0x61, 0x74, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x6d, + 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x0f, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, + 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x31, 0x0a, 0x06, 0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x18, + 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x2e, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x52, 0x06, 0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x75, 0x72, 0x46, + 0x69, 0x67, 0x75, 0x72, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x75, 0x72, + 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x12, 0x3d, 0x0a, 0x0a, 0x70, 0x72, 0x65, 0x69, 0x6e, 0x73, + 0x74, 0x61, 0x6c, 0x6c, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x44, 0x42, 0x55, + 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x2e, 0x50, 0x72, 0x65, 0x69, 0x6e, 0x73, + 0x74, 0x61, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x70, 0x72, 0x65, 0x69, 0x6e, + 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, + 0x1a, 0x46, 0x0a, 0x0f, 0x50, 0x72, 0x65, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1d, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -166,18 +561,32 @@ func file_userexpand_proto_rawDescGZIP() []byte { return file_userexpand_proto_rawDescData } -var file_userexpand_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_userexpand_proto_msgTypes = make([]protoimpl.MessageInfo, 9) var file_userexpand_proto_goTypes = []interface{}{ - (*DBUserExpand)(nil), // 0: DBUserExpand - nil, // 1: DBUserExpand.TujianEntry + (*Hair)(nil), // 0: Hair + (*Eyes)(nil), // 1: Eyes + (*Mouth)(nil), // 2: Mouth + (*Body)(nil), // 3: Body + (*Complexion)(nil), // 4: Complexion + (*Figure)(nil), // 5: Figure + (*DBUserExpand)(nil), // 6: DBUserExpand + nil, // 7: DBUserExpand.TujianEntry + nil, // 8: DBUserExpand.PreinstallEntry } var file_userexpand_proto_depIdxs = []int32{ - 1, // 0: DBUserExpand.tujian:type_name -> DBUserExpand.TujianEntry - 1, // [1:1] is the sub-list for method output_type - 1, // [1:1] is the sub-list for method input_type - 1, // [1:1] is the sub-list for extension type_name - 1, // [1:1] is the sub-list for extension extendee - 0, // [0:1] is the sub-list for field type_name + 0, // 0: Figure.hair:type_name -> Hair + 1, // 1: Figure.eyes:type_name -> Eyes + 2, // 2: Figure.mouth:type_name -> Mouth + 3, // 3: Figure.body:type_name -> Body + 4, // 4: Figure.complexion:type_name -> Complexion + 7, // 5: DBUserExpand.tujian:type_name -> DBUserExpand.TujianEntry + 8, // 6: DBUserExpand.preinstall:type_name -> DBUserExpand.PreinstallEntry + 5, // 7: DBUserExpand.PreinstallEntry.value:type_name -> Figure + 8, // [8:8] is the sub-list for method output_type + 8, // [8:8] is the sub-list for method input_type + 8, // [8:8] is the sub-list for extension type_name + 8, // [8:8] is the sub-list for extension extendee + 0, // [0:8] is the sub-list for field type_name } func init() { file_userexpand_proto_init() } @@ -187,6 +596,78 @@ func file_userexpand_proto_init() { } if !protoimpl.UnsafeEnabled { file_userexpand_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Hair); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_userexpand_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Eyes); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_userexpand_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Mouth); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_userexpand_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Body); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_userexpand_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Complexion); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_userexpand_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Figure); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_userexpand_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DBUserExpand); i { case 0: return &v.state @@ -205,7 +686,7 @@ func file_userexpand_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_userexpand_proto_rawDesc, NumEnums: 0, - NumMessages: 2, + NumMessages: 9, NumExtensions: 0, NumServices: 0, }, diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index 83bc6b541..90ce3d76c 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -16,9 +16,7 @@ type Tables struct { LocalizeConfig_ENCategory *Localize_LocalizeConfig_ENCategory LocalizeConfig_TWCategory *Localize_LocalizeConfig_TWCategory global *Game_global - hero *Game_hero ui *Game_ui - skill *Game_skill plot *Game_plot extservers *Game_extservers skillAtk *Game_skillAtk @@ -68,6 +66,8 @@ type Tables struct { monster *Game_monster equipPos *Game_equipPos playerlv *Game_playerlv + propsgroup *Game_propsgroup + facemod *Game_facemod } func NewTables(loader JsonLoader) (*Tables, error) { @@ -99,24 +99,12 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.global, err = NewGame_global(buf) ; err != nil { return nil, err } - if buf, err = loader("game_hero") ; err != nil { - return nil, err - } - if tables.hero, err = NewGame_hero(buf) ; err != nil { - return nil, err - } if buf, err = loader("game_ui") ; err != nil { return nil, err } if tables.ui, err = NewGame_ui(buf) ; err != nil { return nil, err } - if buf, err = loader("game_skill") ; err != nil { - return nil, err - } - if tables.skill, err = NewGame_skill(buf) ; err != nil { - return nil, err - } if buf, err = loader("game_plot") ; err != nil { return nil, err } @@ -411,5 +399,17 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.playerlv, err = NewGame_playerlv(buf) ; err != nil { return nil, err } + if buf, err = loader("game_propsgroup") ; err != nil { + return nil, err + } + if tables.propsgroup, err = NewGame_propsgroup(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_facemod") ; err != nil { + return nil, err + } + if tables.facemod, err = NewGame_facemod(buf) ; err != nil { + return nil, err + } return tables, nil } diff --git a/sys/configure/structs/game.Figure.go b/sys/configure/structs/game.Figure.go new file mode 100644 index 000000000..ca6add3cc --- /dev/null +++ b/sys/configure/structs/game.Figure.go @@ -0,0 +1,39 @@ + +//------------------------------------------------------------------------------ +// +// 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 Game_Figure struct { + Id int32 + Key string + Color string + Val int32 + PositonX int32 + PositonY int32 + PositonZ int32 + Icon string +} + +func (Game_Figure) GetTypeId() int { + return -1818502016 +} + +func NewGame_Figure(_buf map[string]interface{}) (_v *Game_Figure, err error) { + _v = &Game_Figure{} + { 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; if _v.Key, _ok_ = _buf["key"].(string); !_ok_ { err = errors.New("key error"); return } } + { var _ok_ bool; if _v.Color, _ok_ = _buf["color"].(string); !_ok_ { err = errors.New("color error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["val"].(float64); !_ok_ { err = errors.New("val error"); return }; _v.Val = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["positon_x"].(float64); !_ok_ { err = errors.New("positon_x error"); return }; _v.PositonX = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["positon_y"].(float64); !_ok_ { err = errors.New("positon_y error"); return }; _v.PositonY = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["positon_z"].(float64); !_ok_ { err = errors.New("positon_z error"); return }; _v.PositonZ = int32(_tempNum_) } + { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } + return +} diff --git a/sys/configure/structs/game.facemod.go b/sys/configure/structs/game.facemod.go new file mode 100644 index 000000000..dc10813dc --- /dev/null +++ b/sys/configure/structs/game.facemod.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 Game_facemod struct { + _dataMap map[int32]*Game_facemodData + _dataList []*Game_facemodData +} + +func NewGame_facemod(_buf []map[string]interface{}) (*Game_facemod, error) { + _dataList := make([]*Game_facemodData, 0, len(_buf)) + dataMap := make(map[int32]*Game_facemodData) + for _, _ele_ := range _buf { + if _v, err2 := NewGame_facemodData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &Game_facemod{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *Game_facemod) GetDataMap() map[int32]*Game_facemodData { + return table._dataMap +} + +func (table *Game_facemod) GetDataList() []*Game_facemodData { + return table._dataList +} + +func (table *Game_facemod) Get(key int32) *Game_facemodData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/game.facemodData.go b/sys/configure/structs/game.facemodData.go new file mode 100644 index 000000000..104e459c0 --- /dev/null +++ b/sys/configure/structs/game.facemodData.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 + +import "errors" + +type Game_facemodData struct { + Id int32 + Suitintr string + Figure []*Game_Figure +} + +func (Game_facemodData) GetTypeId() int { + return -214755117 +} + +func NewGame_facemodData(_buf map[string]interface{}) (_v *Game_facemodData, err error) { + _v = &Game_facemodData{} + { 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; if _v.Suitintr, _ok_ = _buf["suitintr"].(string); !_ok_ { err = errors.New("suitintr error"); return } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["figure"].([]interface{}); !_ok_ { err = errors.New("figure error"); return } + + _v.Figure = make([]*Game_Figure, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Game_Figure + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_Figure(_x_); err != nil { return } } + _v.Figure = append(_v.Figure, _list_v_) + } + } + + return +} diff --git a/sys/configure/structs/game.heroStarupData.go b/sys/configure/structs/game.heroStarupData.go index 6fc2174b2..961b6af1f 100644 --- a/sys/configure/structs/game.heroStarupData.go +++ b/sys/configure/structs/game.heroStarupData.go @@ -14,7 +14,7 @@ type Game_heroStarupData struct { Key int32 Id string Star int32 - Needhero string + Needhero int32 Needherostar int32 Needheronum int32 Needrace []int32 @@ -32,7 +32,7 @@ func NewGame_heroStarupData(_buf map[string]interface{}) (_v *Game_heroStarupDat { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) } { 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["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) } - { var _ok_ bool; if _v.Needhero, _ok_ = _buf["needhero"].(string); !_ok_ { err = errors.New("needhero error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["needhero"].(float64); !_ok_ { err = errors.New("needhero error"); return }; _v.Needhero = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["needherostar"].(float64); !_ok_ { err = errors.New("needherostar error"); return }; _v.Needherostar = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["needheronum"].(float64); !_ok_ { err = errors.New("needheronum error"); return }; _v.Needheronum = int32(_tempNum_) } { diff --git a/sys/configure/structs/game.monsterData.go b/sys/configure/structs/game.monsterData.go index a57c022ce..e2df38a20 100644 --- a/sys/configure/structs/game.monsterData.go +++ b/sys/configure/structs/game.monsterData.go @@ -25,11 +25,7 @@ func (Game_monsterData) GetTypeId() int { func NewGame_monsterData(_buf map[string]interface{}) (_v *Game_monsterData, err error) { _v = &Game_monsterData{} { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["monster_id"].(float64); !_ok_ { err = errors.New("monster_id error"); return }; _v.MonsterId = int32(_tempNum_) } -<<<<<<< HEAD { var _ok_ bool; if _v.HeroId, _ok_ = _buf["hero_id"].(string); !_ok_ { err = errors.New("hero_id error"); return } } -======= - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hero_id"].(float64); !_ok_ { err = errors.New("hero_id error"); return }; _v.HeroId = int32(_tempNum_) } ->>>>>>> bb00032 (玩家等级优化) {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) } { var _ok_ bool; if _v.Equip, _ok_ = _buf["equip"].(string); !_ok_ { err = errors.New("equip error"); return } } diff --git a/sys/configure/structs/game.newHeroData.go b/sys/configure/structs/game.newHeroData.go index e8eeb738b..aaf7877e1 100644 --- a/sys/configure/structs/game.newHeroData.go +++ b/sys/configure/structs/game.newHeroData.go @@ -19,6 +19,7 @@ type Game_newHeroData struct { Race int32 Job int32 Type int32 + Handbook int32 Prefab int32 Icon int32 Sound string @@ -33,6 +34,8 @@ type Game_newHeroData struct { Skill2 int32 Skill3 int32 Txt string + Enteranivalue int32 + Camerainterval float32 } func (Game_newHeroData) GetTypeId() int { @@ -48,6 +51,7 @@ func NewGame_newHeroData(_buf map[string]interface{}) (_v *Game_newHeroData, err { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["race"].(float64); !_ok_ { err = errors.New("race error"); return }; _v.Race = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["job"].(float64); !_ok_ { err = errors.New("job error"); return }; _v.Job = 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; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["handbook"].(float64); !_ok_ { err = errors.New("handbook error"); return }; _v.Handbook = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["prefab"].(float64); !_ok_ { err = errors.New("prefab error"); return }; _v.Prefab = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["icon"].(float64); !_ok_ { err = errors.New("icon error"); return }; _v.Icon = int32(_tempNum_) } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["sound"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Sound error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Sound, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } @@ -95,5 +99,7 @@ func NewGame_newHeroData(_buf map[string]interface{}) (_v *Game_newHeroData, err { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill2"].(float64); !_ok_ { err = errors.New("skill2 error"); return }; _v.Skill2 = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill3"].(float64); !_ok_ { err = errors.New("skill3 error"); return }; _v.Skill3 = int32(_tempNum_) } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["enteranivalue"].(float64); !_ok_ { err = errors.New("enteranivalue error"); return }; _v.Enteranivalue = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["camerainterval"].(float64); !_ok_ { err = errors.New("camerainterval error"); return }; _v.Camerainterval = float32(_tempNum_) } return }