diff --git a/bin/json/game_arenarealtimeconfig.json b/bin/json/game_arenarealtimeconfig.json index 8496b3343..e11b11dcd 100644 --- a/bin/json/game_arenarealtimeconfig.json +++ b/bin/json/game_arenarealtimeconfig.json @@ -11,13 +11,6 @@ "RankMax": 299, "ex_reward": [], "RankReturn": -1, - "reward_week": [ - { - "a": "attr", - "t": "arenacoin", - "n": 10 - } - ], "WinReward": [ { "a": "attr", @@ -34,6 +27,7 @@ } ], "LoseRankScore": 5, + "Kscore": 10, "RankIcon": "smithy_atk_1" }, { @@ -54,13 +48,6 @@ } ], "RankReturn": -1, - "reward_week": [ - { - "a": "attr", - "t": "arenacoin", - "n": 12 - } - ], "WinReward": [ { "a": "attr", @@ -77,6 +64,7 @@ } ], "LoseRankScore": 5, + "Kscore": 10, "RankIcon": "smithy_def_4" }, { @@ -97,13 +85,6 @@ } ], "RankReturn": -1, - "reward_week": [ - { - "a": "attr", - "t": "arenacoin", - "n": 14 - } - ], "WinReward": [ { "a": "attr", @@ -120,6 +101,7 @@ } ], "LoseRankScore": 5, + "Kscore": 10, "RankIcon": "smithy_def_1" }, { @@ -140,13 +122,6 @@ } ], "RankReturn": -1, - "reward_week": [ - { - "a": "attr", - "t": "arenacoin", - "n": 16 - } - ], "WinReward": [ { "a": "attr", @@ -163,6 +138,7 @@ } ], "LoseRankScore": 5, + "Kscore": 10, "RankIcon": "smithy_atk_3" }, { @@ -183,13 +159,6 @@ } ], "RankReturn": -1, - "reward_week": [ - { - "a": "attr", - "t": "arenacoin", - "n": 18 - } - ], "WinReward": [ { "a": "attr", @@ -206,6 +175,7 @@ } ], "LoseRankScore": 5, + "Kscore": 10, "RankIcon": "smithy_def_2" }, { @@ -226,13 +196,6 @@ } ], "RankReturn": -1, - "reward_week": [ - { - "a": "attr", - "t": "arenacoin", - "n": 20 - } - ], "WinReward": [ { "a": "attr", @@ -249,6 +212,7 @@ } ], "LoseRankScore": 5, + "Kscore": 10, "RankIcon": "smithy_sup_4" }, { @@ -269,13 +233,6 @@ } ], "RankReturn": 800, - "reward_week": [ - { - "a": "attr", - "t": "arenacoin", - "n": 22 - } - ], "WinReward": [ { "a": "attr", @@ -292,6 +249,7 @@ } ], "LoseRankScore": 5, + "Kscore": 10, "RankIcon": "smithy_atk_4" }, { @@ -312,13 +270,6 @@ } ], "RankReturn": 800, - "reward_week": [ - { - "a": "attr", - "t": "arenacoin", - "n": 24 - } - ], "WinReward": [ { "a": "attr", @@ -335,6 +286,7 @@ } ], "LoseRankScore": 5, + "Kscore": 10, "RankIcon": "smithy_atk_5" }, { @@ -355,13 +307,6 @@ } ], "RankReturn": 800, - "reward_week": [ - { - "a": "attr", - "t": "arenacoin", - "n": 26 - } - ], "WinReward": [ { "a": "attr", @@ -378,6 +323,7 @@ } ], "LoseRankScore": 5, + "Kscore": 10, "RankIcon": "" }, { @@ -398,13 +344,6 @@ } ], "RankReturn": 800, - "reward_week": [ - { - "a": "attr", - "t": "arenacoin", - "n": 28 - } - ], "WinReward": [ { "a": "attr", @@ -421,6 +360,7 @@ } ], "LoseRankScore": 5, + "Kscore": 10, "RankIcon": "" }, { @@ -441,13 +381,6 @@ } ], "RankReturn": 1400, - "reward_week": [ - { - "a": "attr", - "t": "arenacoin", - "n": 30 - } - ], "WinReward": [ { "a": "attr", @@ -464,6 +397,7 @@ } ], "LoseRankScore": 6, + "Kscore": 10, "RankIcon": "" }, { @@ -484,13 +418,6 @@ } ], "RankReturn": 1400, - "reward_week": [ - { - "a": "attr", - "t": "arenacoin", - "n": 32 - } - ], "WinReward": [ { "a": "attr", @@ -507,6 +434,7 @@ } ], "LoseRankScore": 6, + "Kscore": 10, "RankIcon": "" }, { @@ -527,13 +455,6 @@ } ], "RankReturn": 1400, - "reward_week": [ - { - "a": "attr", - "t": "arenacoin", - "n": 34 - } - ], "WinReward": [ { "a": "attr", @@ -550,6 +471,7 @@ } ], "LoseRankScore": 6, + "Kscore": 10, "RankIcon": "" }, { @@ -570,13 +492,6 @@ } ], "RankReturn": 1400, - "reward_week": [ - { - "a": "attr", - "t": "arenacoin", - "n": 36 - } - ], "WinReward": [ { "a": "attr", @@ -593,6 +508,7 @@ } ], "LoseRankScore": 6, + "Kscore": 10, "RankIcon": "" }, { @@ -613,13 +529,6 @@ } ], "RankReturn": 2000, - "reward_week": [ - { - "a": "attr", - "t": "arenacoin", - "n": 38 - } - ], "WinReward": [ { "a": "attr", @@ -636,6 +545,7 @@ } ], "LoseRankScore": 7, + "Kscore": 10, "RankIcon": "" }, { @@ -656,13 +566,6 @@ } ], "RankReturn": 2000, - "reward_week": [ - { - "a": "attr", - "t": "arenacoin", - "n": 40 - } - ], "WinReward": [ { "a": "attr", @@ -679,6 +582,7 @@ } ], "LoseRankScore": 7, + "Kscore": 10, "RankIcon": "" }, { @@ -699,13 +603,6 @@ } ], "RankReturn": 2000, - "reward_week": [ - { - "a": "attr", - "t": "arenacoin", - "n": 42 - } - ], "WinReward": [ { "a": "attr", @@ -722,6 +619,7 @@ } ], "LoseRankScore": 7, + "Kscore": 10, "RankIcon": "" }, { @@ -742,13 +640,6 @@ } ], "RankReturn": 2000, - "reward_week": [ - { - "a": "attr", - "t": "arenacoin", - "n": 44 - } - ], "WinReward": [ { "a": "attr", @@ -765,6 +656,7 @@ } ], "LoseRankScore": 7, + "Kscore": 10, "RankIcon": "" }, { @@ -785,13 +677,6 @@ } ], "RankReturn": 2000, - "reward_week": [ - { - "a": "attr", - "t": "arenacoin", - "n": 46 - } - ], "WinReward": [ { "a": "attr", @@ -808,6 +693,7 @@ } ], "LoseRankScore": 7, + "Kscore": 10, "RankIcon": "" }, { @@ -828,13 +714,6 @@ } ], "RankReturn": 3000, - "reward_week": [ - { - "a": "attr", - "t": "arenacoin", - "n": 48 - } - ], "WinReward": [ { "a": "attr", @@ -851,6 +730,7 @@ } ], "LoseRankScore": 8, + "Kscore": 10, "RankIcon": "" }, { @@ -871,13 +751,6 @@ } ], "RankReturn": 3000, - "reward_week": [ - { - "a": "attr", - "t": "arenacoin", - "n": 50 - } - ], "WinReward": [ { "a": "attr", @@ -894,6 +767,7 @@ } ], "LoseRankScore": 8, + "Kscore": 10, "RankIcon": "" }, { @@ -914,13 +788,6 @@ } ], "RankReturn": 3000, - "reward_week": [ - { - "a": "attr", - "t": "arenacoin", - "n": 52 - } - ], "WinReward": [ { "a": "attr", @@ -937,6 +804,7 @@ } ], "LoseRankScore": 8, + "Kscore": 10, "RankIcon": "" }, { @@ -957,13 +825,6 @@ } ], "RankReturn": 3000, - "reward_week": [ - { - "a": "attr", - "t": "arenacoin", - "n": 54 - } - ], "WinReward": [ { "a": "attr", @@ -980,6 +841,7 @@ } ], "LoseRankScore": 8, + "Kscore": 10, "RankIcon": "" }, { @@ -1000,13 +862,6 @@ } ], "RankReturn": 3000, - "reward_week": [ - { - "a": "attr", - "t": "arenacoin", - "n": 56 - } - ], "WinReward": [ { "a": "attr", @@ -1023,6 +878,7 @@ } ], "LoseRankScore": 8, + "Kscore": 10, "RankIcon": "" }, { @@ -1043,13 +899,6 @@ } ], "RankReturn": 4000, - "reward_week": [ - { - "a": "attr", - "t": "arenacoin", - "n": 58 - } - ], "WinReward": [ { "a": "attr", @@ -1066,6 +915,7 @@ } ], "LoseRankScore": 9, + "Kscore": 10, "RankIcon": "" }, { @@ -1086,13 +936,6 @@ } ], "RankReturn": 4000, - "reward_week": [ - { - "a": "attr", - "t": "arenacoin", - "n": 60 - } - ], "WinReward": [ { "a": "attr", @@ -1109,6 +952,7 @@ } ], "LoseRankScore": 9, + "Kscore": 10, "RankIcon": "" }, { @@ -1129,13 +973,6 @@ } ], "RankReturn": 4000, - "reward_week": [ - { - "a": "attr", - "t": "arenacoin", - "n": 62 - } - ], "WinReward": [ { "a": "attr", @@ -1152,6 +989,7 @@ } ], "LoseRankScore": 9, + "Kscore": 10, "RankIcon": "" }, { @@ -1172,13 +1010,6 @@ } ], "RankReturn": 4000, - "reward_week": [ - { - "a": "attr", - "t": "arenacoin", - "n": 64 - } - ], "WinReward": [ { "a": "attr", @@ -1195,6 +1026,7 @@ } ], "LoseRankScore": 9, + "Kscore": 10, "RankIcon": "" }, { @@ -1215,13 +1047,6 @@ } ], "RankReturn": 4000, - "reward_week": [ - { - "a": "attr", - "t": "arenacoin", - "n": 66 - } - ], "WinReward": [ { "a": "attr", @@ -1238,6 +1063,7 @@ } ], "LoseRankScore": 9, + "Kscore": 10, "RankIcon": "" } ] \ No newline at end of file diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index 6a7fc490b..44a6069cf 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -1294,7 +1294,7 @@ "HeroCount": 5, "readyScene": "scenesfight_role_interface_02", "battleScenes": [ - "bossfight_naturetitan_02" + "bossfight_naturetitan_06" ], "BGMusic": "", "LoadingId": 0, @@ -1333,7 +1333,7 @@ "HeroCount": 5, "readyScene": "scenesfight_role_interface_02", "battleScenes": [ - "bossfight_naturetitan_03" + "bossfight_naturetitan_05" ], "BGMusic": "", "LoadingId": 0, @@ -2670,7 +2670,7 @@ "HeroCount": 5, "readyScene": "scenesfight_role_interface_02", "battleScenes": [ - "bossfight_naturetitan_02", + "bossfight_naturetitan_06", "bossfight_naturetitan_04" ], "BGMusic": "", @@ -3233,7 +3233,7 @@ "HeroCount": 5, "readyScene": "scenesfight_role_interface_02", "battleScenes": [ - "bossfight_naturetitan_03" + "bossfight_naturetitan_05" ], "BGMusic": "", "LoadingId": 0, @@ -3311,7 +3311,7 @@ "HeroCount": 5, "readyScene": "scenesfight_role_interface_02", "battleScenes": [ - "bossfight_naturetitan_02" + "bossfight_naturetitan_06" ], "BGMusic": "", "LoadingId": 0, @@ -3350,7 +3350,7 @@ "HeroCount": 5, "readyScene": "scenesfight_role_interface_02", "battleScenes": [ - "bossfight_naturetitan_03" + "bossfight_naturetitan_05" ], "BGMusic": "", "LoadingId": 0, @@ -4527,7 +4527,7 @@ "HeroCount": 5, "readyScene": "scenesfight_role_interface_02", "battleScenes": [ - "bossfight_naturetitan_03" + "bossfight_naturetitan_05" ], "BGMusic": "", "LoadingId": 0, @@ -4566,7 +4566,7 @@ "HeroCount": 5, "readyScene": "scenesfight_role_interface_02", "battleScenes": [ - "bossfight_naturetitan_02" + "bossfight_naturetitan_06" ], "BGMusic": "", "LoadingId": 0, diff --git a/bin/json/game_favorability.json b/bin/json/game_favorability.json index e073f12ce..c2a41b63b 100644 --- a/bin/json/game_favorability.json +++ b/bin/json/game_favorability.json @@ -52440,15 +52440,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_51", - "text": "" + "text": "哦!这味道就像坏蛋联盟一样,充满魅力的芬芳!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_51", - "text": "" + "text": "味道不错,但如果能配上一杯上好的香槟那会更加完美!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_51", - "text": "" + "text": "呜……快拿走,快拿走!我要不能呼吸了……" }, "favorlv": [ 3, @@ -52546,15 +52546,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_51", - "text": "" + "text": "哦!这味道就像坏蛋联盟一样,充满魅力的芬芳!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_51", - "text": "" + "text": "味道不错,但如果能配上一杯上好的香槟那会更加完美!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_51", - "text": "" + "text": "呜……快拿走,快拿走!我要不能呼吸了……" }, "favorlv": [ 3, @@ -52652,15 +52652,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_51", - "text": "" + "text": "哦!这味道就像坏蛋联盟一样,充满魅力的芬芳!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_51", - "text": "" + "text": "味道不错,但如果能配上一杯上好的香槟那会更加完美!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_51", - "text": "" + "text": "呜……快拿走,快拿走!我要不能呼吸了……" }, "favorlv": [ 3, @@ -52758,15 +52758,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_51", - "text": "" + "text": "哦!这味道就像坏蛋联盟一样,充满魅力的芬芳!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_51", - "text": "" + "text": "味道不错,但如果能配上一杯上好的香槟那会更加完美!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_51", - "text": "" + "text": "呜……快拿走,快拿走!我要不能呼吸了……" }, "favorlv": [ 3, @@ -52864,15 +52864,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_51", - "text": "" + "text": "哦!这味道就像坏蛋联盟一样,充满魅力的芬芳!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_51", - "text": "" + "text": "味道不错,但如果能配上一杯上好的香槟那会更加完美!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_51", - "text": "" + "text": "呜……快拿走,快拿走!我要不能呼吸了……" }, "favorlv": [ 3, @@ -52970,15 +52970,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_51", - "text": "" + "text": "哦!这味道就像坏蛋联盟一样,充满魅力的芬芳!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_51", - "text": "" + "text": "味道不错,但如果能配上一杯上好的香槟那会更加完美!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_51", - "text": "" + "text": "呜……快拿走,快拿走!我要不能呼吸了……" }, "favorlv": [ 3, @@ -53076,15 +53076,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_51", - "text": "" + "text": "哦!这味道就像坏蛋联盟一样,充满魅力的芬芳!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_51", - "text": "" + "text": "味道不错,但如果能配上一杯上好的香槟那会更加完美!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_51", - "text": "" + "text": "呜……快拿走,快拿走!我要不能呼吸了……" }, "favorlv": [ 3, @@ -53182,15 +53182,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_51", - "text": "" + "text": "哦!这味道就像坏蛋联盟一样,充满魅力的芬芳!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_51", - "text": "" + "text": "味道不错,但如果能配上一杯上好的香槟那会更加完美!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_51", - "text": "" + "text": "呜……快拿走,快拿走!我要不能呼吸了……" }, "favorlv": [ 3, @@ -53288,15 +53288,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_51", - "text": "" + "text": "哦!这味道就像坏蛋联盟一样,充满魅力的芬芳!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_51", - "text": "" + "text": "味道不错,但如果能配上一杯上好的香槟那会更加完美!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_51", - "text": "" + "text": "呜……快拿走,快拿走!我要不能呼吸了……" }, "favorlv": [ 3, @@ -53394,15 +53394,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_51", - "text": "" + "text": "哦!这味道就像坏蛋联盟一样,充满魅力的芬芳!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_51", - "text": "" + "text": "味道不错,但如果能配上一杯上好的香槟那会更加完美!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_51", - "text": "" + "text": "呜……快拿走,快拿走!我要不能呼吸了……" }, "favorlv": [ 3, @@ -53494,15 +53494,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_52", - "text": "" + "text": "喔!这样的美味除了亲衣节我还是第一次吃到!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_52", - "text": "" + "text": "要是能再加点盐那将更加美味!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_52", - "text": "" + "text": "这玩意恐怕只有龙才咽的下!" }, "favorlv": [ 3, @@ -53600,15 +53600,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_52", - "text": "" + "text": "喔!这样的美味除了亲衣节我还是第一次吃到!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_52", - "text": "" + "text": "要是能再加点盐那将更加美味!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_52", - "text": "" + "text": "这玩意恐怕只有龙才咽的下!" }, "favorlv": [ 3, @@ -53706,15 +53706,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_52", - "text": "" + "text": "喔!这样的美味除了亲衣节我还是第一次吃到!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_52", - "text": "" + "text": "要是能再加点盐那将更加美味!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_52", - "text": "" + "text": "这玩意恐怕只有龙才咽的下!" }, "favorlv": [ 3, @@ -53812,15 +53812,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_52", - "text": "" + "text": "喔!这样的美味除了亲衣节我还是第一次吃到!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_52", - "text": "" + "text": "要是能再加点盐那将更加美味!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_52", - "text": "" + "text": "这玩意恐怕只有龙才咽的下!" }, "favorlv": [ 3, @@ -53918,15 +53918,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_52", - "text": "" + "text": "喔!这样的美味除了亲衣节我还是第一次吃到!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_52", - "text": "" + "text": "要是能再加点盐那将更加美味!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_52", - "text": "" + "text": "这玩意恐怕只有龙才咽的下!" }, "favorlv": [ 3, @@ -54024,15 +54024,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_52", - "text": "" + "text": "喔!这样的美味除了亲衣节我还是第一次吃到!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_52", - "text": "" + "text": "要是能再加点盐那将更加美味!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_52", - "text": "" + "text": "这玩意恐怕只有龙才咽的下!" }, "favorlv": [ 3, @@ -54130,15 +54130,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_52", - "text": "" + "text": "喔!这样的美味除了亲衣节我还是第一次吃到!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_52", - "text": "" + "text": "要是能再加点盐那将更加美味!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_52", - "text": "" + "text": "这玩意恐怕只有龙才咽的下!" }, "favorlv": [ 3, @@ -54236,15 +54236,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_52", - "text": "" + "text": "喔!这样的美味除了亲衣节我还是第一次吃到!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_52", - "text": "" + "text": "要是能再加点盐那将更加美味!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_52", - "text": "" + "text": "这玩意恐怕只有龙才咽的下!" }, "favorlv": [ 3, @@ -54342,15 +54342,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_52", - "text": "" + "text": "喔!这样的美味除了亲衣节我还是第一次吃到!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_52", - "text": "" + "text": "要是能再加点盐那将更加美味!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_52", - "text": "" + "text": "这玩意恐怕只有龙才咽的下!" }, "favorlv": [ 3, @@ -54448,15 +54448,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_52", - "text": "" + "text": "喔!这样的美味除了亲衣节我还是第一次吃到!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_52", - "text": "" + "text": "要是能再加点盐那将更加美味!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_52", - "text": "" + "text": "这玩意恐怕只有龙才咽的下!" }, "favorlv": [ 3, @@ -54548,15 +54548,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_53", - "text": "" + "text": "好吃!还有没有,再来,再来!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_53", - "text": "" + "text": "嗯……勉强填饱肚子。" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_53", - "text": "" + "text": "啊,呸!什么东西!真难吃!" }, "favorlv": [ 3, @@ -54654,15 +54654,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_53", - "text": "" + "text": "好吃!还有没有,再来,再来!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_53", - "text": "" + "text": "嗯……勉强填饱肚子。" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_53", - "text": "" + "text": "啊,呸!什么东西!真难吃!" }, "favorlv": [ 3, @@ -54760,15 +54760,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_53", - "text": "" + "text": "好吃!还有没有,再来,再来!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_53", - "text": "" + "text": "嗯……勉强填饱肚子。" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_53", - "text": "" + "text": "啊,呸!什么东西!真难吃!" }, "favorlv": [ 3, @@ -54866,15 +54866,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_53", - "text": "" + "text": "好吃!还有没有,再来,再来!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_53", - "text": "" + "text": "嗯……勉强填饱肚子。" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_53", - "text": "" + "text": "啊,呸!什么东西!真难吃!" }, "favorlv": [ 3, @@ -54972,15 +54972,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_53", - "text": "" + "text": "好吃!还有没有,再来,再来!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_53", - "text": "" + "text": "嗯……勉强填饱肚子。" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_53", - "text": "" + "text": "啊,呸!什么东西!真难吃!" }, "favorlv": [ 3, @@ -55078,15 +55078,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_53", - "text": "" + "text": "好吃!还有没有,再来,再来!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_53", - "text": "" + "text": "嗯……勉强填饱肚子。" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_53", - "text": "" + "text": "啊,呸!什么东西!真难吃!" }, "favorlv": [ 3, @@ -55184,15 +55184,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_53", - "text": "" + "text": "好吃!还有没有,再来,再来!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_53", - "text": "" + "text": "嗯……勉强填饱肚子。" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_53", - "text": "" + "text": "啊,呸!什么东西!真难吃!" }, "favorlv": [ 3, @@ -55290,15 +55290,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_53", - "text": "" + "text": "好吃!还有没有,再来,再来!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_53", - "text": "" + "text": "嗯……勉强填饱肚子。" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_53", - "text": "" + "text": "啊,呸!什么东西!真难吃!" }, "favorlv": [ 3, @@ -55396,15 +55396,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_53", - "text": "" + "text": "好吃!还有没有,再来,再来!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_53", - "text": "" + "text": "嗯……勉强填饱肚子。" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_53", - "text": "" + "text": "啊,呸!什么东西!真难吃!" }, "favorlv": [ 3, @@ -55502,15 +55502,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_53", - "text": "" + "text": "好吃!还有没有,再来,再来!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_53", - "text": "" + "text": "嗯……勉强填饱肚子。" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_53", - "text": "" + "text": "啊,呸!什么东西!真难吃!" }, "favorlv": [ 3, @@ -55602,15 +55602,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_54", - "text": "" + "text": "哇喔!真是太棒了!我都想让钩牙来一起品尝了。" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_54", - "text": "" + "text": "不错,是维京人喜欢的口味!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_54", - "text": "" + "text": "……我总算知道钩牙吃龙薄荷时的感受了。" }, "favorlv": [ 3, @@ -55707,15 +55707,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_54", - "text": "" + "text": "哇喔!真是太棒了!我都想让钩牙来一起品尝了。" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_54", - "text": "" + "text": "不错,是维京人喜欢的口味!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_54", - "text": "" + "text": "……我总算知道钩牙吃龙薄荷时的感受了。" }, "favorlv": [ 3, @@ -55812,15 +55812,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_54", - "text": "" + "text": "哇喔!真是太棒了!我都想让钩牙来一起品尝了。" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_54", - "text": "" + "text": "不错,是维京人喜欢的口味!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_54", - "text": "" + "text": "……我总算知道钩牙吃龙薄荷时的感受了。" }, "favorlv": [ 3, @@ -55917,15 +55917,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_54", - "text": "" + "text": "哇喔!真是太棒了!我都想让钩牙来一起品尝了。" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_54", - "text": "" + "text": "不错,是维京人喜欢的口味!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_54", - "text": "" + "text": "……我总算知道钩牙吃龙薄荷时的感受了。" }, "favorlv": [ 3, @@ -56022,15 +56022,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_54", - "text": "" + "text": "哇喔!真是太棒了!我都想让钩牙来一起品尝了。" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_54", - "text": "" + "text": "不错,是维京人喜欢的口味!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_54", - "text": "" + "text": "……我总算知道钩牙吃龙薄荷时的感受了。" }, "favorlv": [ 3, @@ -56127,15 +56127,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_54", - "text": "" + "text": "哇喔!真是太棒了!我都想让钩牙来一起品尝了。" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_54", - "text": "" + "text": "不错,是维京人喜欢的口味!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_54", - "text": "" + "text": "……我总算知道钩牙吃龙薄荷时的感受了。" }, "favorlv": [ 3, @@ -56232,15 +56232,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_54", - "text": "" + "text": "哇喔!真是太棒了!我都想让钩牙来一起品尝了。" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_54", - "text": "" + "text": "不错,是维京人喜欢的口味!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_54", - "text": "" + "text": "……我总算知道钩牙吃龙薄荷时的感受了。" }, "favorlv": [ 3, @@ -56337,15 +56337,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_54", - "text": "" + "text": "哇喔!真是太棒了!我都想让钩牙来一起品尝了。" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_54", - "text": "" + "text": "不错,是维京人喜欢的口味!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_54", - "text": "" + "text": "……我总算知道钩牙吃龙薄荷时的感受了。" }, "favorlv": [ 3, @@ -56442,15 +56442,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_54", - "text": "" + "text": "哇喔!真是太棒了!我都想让钩牙来一起品尝了。" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_54", - "text": "" + "text": "不错,是维京人喜欢的口味!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_54", - "text": "" + "text": "……我总算知道钩牙吃龙薄荷时的感受了。" }, "favorlv": [ 3, @@ -56547,15 +56547,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_54", - "text": "" + "text": "哇喔!真是太棒了!我都想让钩牙来一起品尝了。" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_54", - "text": "" + "text": "不错,是维京人喜欢的口味!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_54", - "text": "" + "text": "……我总算知道钩牙吃龙薄荷时的感受了。" }, "favorlv": [ 3, @@ -56646,15 +56646,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_55", - "text": "" + "text": "真是棒极了,能不能告诉我这东西要怎么做?" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_55", - "text": "" + "text": "还有么?今天的食物看来有着落了!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_55", - "text": "" + "text": "呜嗯……原始人还是得靠自己去找食物才行……" }, "favorlv": [ 3, @@ -56752,15 +56752,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_55", - "text": "" + "text": "真是棒极了,能不能告诉我这东西要怎么做?" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_55", - "text": "" + "text": "还有么?今天的食物看来有着落了!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_55", - "text": "" + "text": "呜嗯……原始人还是得靠自己去找食物才行……" }, "favorlv": [ 3, @@ -56858,15 +56858,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_55", - "text": "" + "text": "真是棒极了,能不能告诉我这东西要怎么做?" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_55", - "text": "" + "text": "还有么?今天的食物看来有着落了!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_55", - "text": "" + "text": "呜嗯……原始人还是得靠自己去找食物才行……" }, "favorlv": [ 3, @@ -56964,15 +56964,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_55", - "text": "" + "text": "真是棒极了,能不能告诉我这东西要怎么做?" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_55", - "text": "" + "text": "还有么?今天的食物看来有着落了!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_55", - "text": "" + "text": "呜嗯……原始人还是得靠自己去找食物才行……" }, "favorlv": [ 3, @@ -57070,15 +57070,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_55", - "text": "" + "text": "真是棒极了,能不能告诉我这东西要怎么做?" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_55", - "text": "" + "text": "还有么?今天的食物看来有着落了!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_55", - "text": "" + "text": "呜嗯……原始人还是得靠自己去找食物才行……" }, "favorlv": [ 3, @@ -57176,15 +57176,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_55", - "text": "" + "text": "真是棒极了,能不能告诉我这东西要怎么做?" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_55", - "text": "" + "text": "还有么?今天的食物看来有着落了!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_55", - "text": "" + "text": "呜嗯……原始人还是得靠自己去找食物才行……" }, "favorlv": [ 3, @@ -57282,15 +57282,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_55", - "text": "" + "text": "真是棒极了,能不能告诉我这东西要怎么做?" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_55", - "text": "" + "text": "还有么?今天的食物看来有着落了!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_55", - "text": "" + "text": "呜嗯……原始人还是得靠自己去找食物才行……" }, "favorlv": [ 3, @@ -57388,15 +57388,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_55", - "text": "" + "text": "真是棒极了,能不能告诉我这东西要怎么做?" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_55", - "text": "" + "text": "还有么?今天的食物看来有着落了!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_55", - "text": "" + "text": "呜嗯……原始人还是得靠自己去找食物才行……" }, "favorlv": [ 3, @@ -57494,15 +57494,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_55", - "text": "" + "text": "真是棒极了,能不能告诉我这东西要怎么做?" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_55", - "text": "" + "text": "还有么?今天的食物看来有着落了!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_55", - "text": "" + "text": "呜嗯……原始人还是得靠自己去找食物才行……" }, "favorlv": [ 3, @@ -57600,15 +57600,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_55", - "text": "" + "text": "真是棒极了,能不能告诉我这东西要怎么做?" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_55", - "text": "" + "text": "还有么?今天的食物看来有着落了!" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_55", - "text": "" + "text": "呜嗯……原始人还是得靠自己去找食物才行……" }, "favorlv": [ 3, @@ -57700,15 +57700,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_56", - "text": "" + "text": "给你三分钟时间,再给我来一份这个食物!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_56", - "text": "" + "text": "还不错,这次就暂且放过你吧。" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_56", - "text": "" + "text": "下次敢拿这么难吃的东西来,就等着吃我一镖!" }, "favorlv": [ 3, @@ -57806,15 +57806,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_56", - "text": "" + "text": "给你三分钟时间,再给我来一份这个食物!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_56", - "text": "" + "text": "还不错,这次就暂且放过你吧。" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_56", - "text": "" + "text": "下次敢拿这么难吃的东西来,就等着吃我一镖!" }, "favorlv": [ 3, @@ -57912,15 +57912,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_56", - "text": "" + "text": "给你三分钟时间,再给我来一份这个食物!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_56", - "text": "" + "text": "还不错,这次就暂且放过你吧。" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_56", - "text": "" + "text": "下次敢拿这么难吃的东西来,就等着吃我一镖!" }, "favorlv": [ 3, @@ -58018,15 +58018,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_56", - "text": "" + "text": "给你三分钟时间,再给我来一份这个食物!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_56", - "text": "" + "text": "还不错,这次就暂且放过你吧。" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_56", - "text": "" + "text": "下次敢拿这么难吃的东西来,就等着吃我一镖!" }, "favorlv": [ 3, @@ -58124,15 +58124,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_56", - "text": "" + "text": "给你三分钟时间,再给我来一份这个食物!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_56", - "text": "" + "text": "还不错,这次就暂且放过你吧。" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_56", - "text": "" + "text": "下次敢拿这么难吃的东西来,就等着吃我一镖!" }, "favorlv": [ 3, @@ -58230,15 +58230,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_56", - "text": "" + "text": "给你三分钟时间,再给我来一份这个食物!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_56", - "text": "" + "text": "还不错,这次就暂且放过你吧。" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_56", - "text": "" + "text": "下次敢拿这么难吃的东西来,就等着吃我一镖!" }, "favorlv": [ 3, @@ -58336,15 +58336,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_56", - "text": "" + "text": "给你三分钟时间,再给我来一份这个食物!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_56", - "text": "" + "text": "还不错,这次就暂且放过你吧。" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_56", - "text": "" + "text": "下次敢拿这么难吃的东西来,就等着吃我一镖!" }, "favorlv": [ 3, @@ -58442,15 +58442,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_56", - "text": "" + "text": "给你三分钟时间,再给我来一份这个食物!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_56", - "text": "" + "text": "还不错,这次就暂且放过你吧。" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_56", - "text": "" + "text": "下次敢拿这么难吃的东西来,就等着吃我一镖!" }, "favorlv": [ 3, @@ -58548,15 +58548,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_56", - "text": "" + "text": "给你三分钟时间,再给我来一份这个食物!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_56", - "text": "" + "text": "还不错,这次就暂且放过你吧。" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_56", - "text": "" + "text": "下次敢拿这么难吃的东西来,就等着吃我一镖!" }, "favorlv": [ 3, @@ -58654,15 +58654,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_56", - "text": "" + "text": "给你三分钟时间,再给我来一份这个食物!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_56", - "text": "" + "text": "还不错,这次就暂且放过你吧。" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_56", - "text": "" + "text": "下次敢拿这么难吃的东西来,就等着吃我一镖!" }, "favorlv": [ 3, @@ -58754,15 +58754,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_57", - "text": "" + "text": "这东西比推推糖还要美味!我一口能吞下十个!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_57", - "text": "" + "text": "哎,就凑合凑合吃吧。" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_57", - "text": "" + "text": "这是什么东西?像是拌了食人鱼的屁一样……" }, "favorlv": [ 3, @@ -58860,15 +58860,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_57", - "text": "" + "text": "这东西比推推糖还要美味!我一口能吞下十个!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_57", - "text": "" + "text": "哎,就凑合凑合吃吧。" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_57", - "text": "" + "text": "这是什么东西?像是拌了食人鱼的屁一样……" }, "favorlv": [ 3, @@ -58966,15 +58966,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_57", - "text": "" + "text": "这东西比推推糖还要美味!我一口能吞下十个!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_57", - "text": "" + "text": "哎,就凑合凑合吃吧。" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_57", - "text": "" + "text": "这是什么东西?像是拌了食人鱼的屁一样……" }, "favorlv": [ 3, @@ -59072,15 +59072,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_57", - "text": "" + "text": "这东西比推推糖还要美味!我一口能吞下十个!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_57", - "text": "" + "text": "哎,就凑合凑合吃吧。" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_57", - "text": "" + "text": "这是什么东西?像是拌了食人鱼的屁一样……" }, "favorlv": [ 3, @@ -59178,15 +59178,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_57", - "text": "" + "text": "这东西比推推糖还要美味!我一口能吞下十个!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_57", - "text": "" + "text": "哎,就凑合凑合吃吧。" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_57", - "text": "" + "text": "这是什么东西?像是拌了食人鱼的屁一样……" }, "favorlv": [ 3, @@ -59284,15 +59284,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_57", - "text": "" + "text": "这东西比推推糖还要美味!我一口能吞下十个!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_57", - "text": "" + "text": "哎,就凑合凑合吃吧。" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_57", - "text": "" + "text": "这是什么东西?像是拌了食人鱼的屁一样……" }, "favorlv": [ 3, @@ -59390,15 +59390,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_57", - "text": "" + "text": "这东西比推推糖还要美味!我一口能吞下十个!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_57", - "text": "" + "text": "哎,就凑合凑合吃吧。" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_57", - "text": "" + "text": "这是什么东西?像是拌了食人鱼的屁一样……" }, "favorlv": [ 3, @@ -59496,15 +59496,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_57", - "text": "" + "text": "这东西比推推糖还要美味!我一口能吞下十个!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_57", - "text": "" + "text": "哎,就凑合凑合吃吧。" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_57", - "text": "" + "text": "这是什么东西?像是拌了食人鱼的屁一样……" }, "favorlv": [ 3, @@ -59602,15 +59602,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_57", - "text": "" + "text": "这东西比推推糖还要美味!我一口能吞下十个!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_57", - "text": "" + "text": "哎,就凑合凑合吃吧。" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_57", - "text": "" + "text": "这是什么东西?像是拌了食人鱼的屁一样……" }, "favorlv": [ 3, @@ -59708,15 +59708,15 @@ ], "likes_txt": { "key": "favorability_favorability_likes_txt_57", - "text": "" + "text": "这东西比推推糖还要美味!我一口能吞下十个!" }, "ordinary_txt": { "key": "favorability_favorability_ordinary_txt_57", - "text": "" + "text": "哎,就凑合凑合吃吧。" }, "disliking_txt": { "key": "favorability_favorability_disliking_txt_57", - "text": "" + "text": "这是什么东西?像是拌了食人鱼的屁一样……" }, "favorlv": [ 3, diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index cb8a7910a..21286e6af 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -1205,7 +1205,7 @@ "captainId": 0, "IsBoss": false, "bossHpCnt": 0, - "heroid": 51050, + "heroid": 51150, "star": 3, "equip": [], "newskill": [], @@ -1230,7 +1230,7 @@ "captainId": 0, "IsBoss": false, "bossHpCnt": 0, - "heroid": 51052, + "heroid": 51352, "star": 3, "equip": [], "newskill": [], @@ -1580,7 +1580,7 @@ "captainId": 0, "IsBoss": false, "bossHpCnt": 0, - "heroid": 51050, + "heroid": 51350, "star": 3, "equip": [], "newskill": [], @@ -1605,7 +1605,7 @@ "captainId": 0, "IsBoss": false, "bossHpCnt": 0, - "heroid": 51052, + "heroid": 51552, "star": 3, "equip": [], "newskill": [], @@ -1955,7 +1955,7 @@ "captainId": 0, "IsBoss": false, "bossHpCnt": 0, - "heroid": 51050, + "heroid": 51150, "star": 3, "equip": [], "newskill": [], @@ -3033,7 +3033,7 @@ "captainId": 0, "IsBoss": false, "bossHpCnt": 0, - "heroid": 51050, + "heroid": 51150, "star": 3, "equip": [], "newskill": [], @@ -3058,7 +3058,7 @@ "captainId": 0, "IsBoss": false, "bossHpCnt": 0, - "heroid": 51050, + "heroid": 51350, "star": 3, "equip": [], "newskill": [], @@ -3108,7 +3108,7 @@ "captainId": 0, "IsBoss": false, "bossHpCnt": 0, - "heroid": 51052, + "heroid": 51552, "star": 3, "equip": [], "newskill": [], @@ -3433,7 +3433,7 @@ "captainId": 0, "IsBoss": false, "bossHpCnt": 0, - "heroid": 51050, + "heroid": 51150, "star": 3, "equip": [], "newskill": [], @@ -3483,7 +3483,7 @@ "captainId": 0, "IsBoss": false, "bossHpCnt": 0, - "heroid": 51052, + "heroid": 51152, "star": 3, "equip": [], "newskill": [], @@ -3808,7 +3808,7 @@ "captainId": 0, "IsBoss": false, "bossHpCnt": 0, - "heroid": 51050, + "heroid": 51150, "star": 3, "equip": [], "newskill": [], @@ -3833,7 +3833,7 @@ "captainId": 0, "IsBoss": false, "bossHpCnt": 0, - "heroid": 51052, + "heroid": 51352, "star": 3, "equip": [], "newskill": [], diff --git a/bin/json/game_msgdistrib.json b/bin/json/game_msgdistrib.json index 31baef48a..d6688538e 100644 --- a/bin/json/game_msgdistrib.json +++ b/bin/json/game_msgdistrib.json @@ -178,5 +178,11 @@ "open": true, "routrules": "~/worker", "describe": "积分boss" + }, + { + "msgid": "realarena", + "open": true, + "routrules": "~/worker", + "describe": "实时竞技场" } ] \ No newline at end of file diff --git a/bin/json/game_playerinfor_barrage.json b/bin/json/game_playerinfor_barrage.json index 4fd1593a2..c9f4ced01 100644 --- a/bin/json/game_playerinfor_barrage.json +++ b/bin/json/game_playerinfor_barrage.json @@ -9,7 +9,7 @@ "text": "这好像不是熊猫?" }, "time": 90, - "speed": 8087 + "speed": 7733 }, { "id": "2", @@ -20,8 +20,8 @@ "key": "playerinfor_barrage_2", "text": "看起来像个画家。" }, - "time": 315, - "speed": 9576 + "time": 265, + "speed": 8693 }, { "id": "3", @@ -32,8 +32,8 @@ "key": "playerinfor_barrage_3", "text": "为什么会觉得是熊猫啊?" }, - "time": 509, - "speed": 7160 + "time": 423, + "speed": 8500 }, { "id": "4", @@ -44,8 +44,8 @@ "key": "playerinfor_barrage_4", "text": "从石头里蹦出来的人?怎么感觉有点熟悉……" }, - "time": 692, - "speed": 11150 + "time": 538, + "speed": 8962 }, { "id": "5", @@ -56,8 +56,8 @@ "key": "playerinfor_barrage_5", "text": "你可能是听说过从石头里蹦出来的猴子。" }, - "time": 842, - "speed": 8345 + "time": 735, + "speed": 10417 }, { "id": "6", @@ -68,8 +68,8 @@ "key": "playerinfor_barrage_6", "text": "你是从石头里蹦出来的?!" }, - "time": 982, - "speed": 12716 + "time": 851, + "speed": 8348 }, { "id": "7", @@ -80,8 +80,8 @@ "key": "playerinfor_barrage_7", "text": "不!那不是我!" }, - "time": 1097, - "speed": 9045 + "time": 954, + "speed": 10081 }, { "id": "8", @@ -92,8 +92,8 @@ "key": "playerinfor_barrage_8", "text": "哦,传承之人……" }, - "time": 1237, - "speed": 8697 + "time": 1140, + "speed": 9411 }, { "id": "9", @@ -104,8 +104,8 @@ "key": "playerinfor_barrage_9", "text": "月光能量都汇集在他身上了!" }, - "time": 1358, - "speed": 9632 + "time": 1291, + "speed": 12061 }, { "id": "10", @@ -116,8 +116,8 @@ "key": "playerinfor_barrage_10", "text": "那应该不会爆炸吧?" }, - "time": 1556, - "speed": 12657 + "time": 1529, + "speed": 10409 }, { "id": "11", @@ -128,8 +128,8 @@ "key": "playerinfor_barrage_11", "text": "阿宝,你为什么站那么远?" }, - "time": 1748, - "speed": 11054 + "time": 1690, + "speed": 9242 }, { "id": "312", @@ -141,7 +141,7 @@ "text": "哦!那是什么?" }, "time": 90, - "speed": 12923 + "speed": 8229 }, { "id": "313", @@ -152,8 +152,8 @@ "key": "playerinfor_barrage_313", "text": "我有种被她注视的感觉……" }, - "time": 329, - "speed": 10269 + "time": 267, + "speed": 11538 }, { "id": "314", @@ -164,8 +164,8 @@ "key": "playerinfor_barrage_314", "text": "好像是一种叫做“照相”的魔法……" }, - "time": 538, - "speed": 9762 + "time": 471, + "speed": 11224 }, { "id": "315", @@ -176,8 +176,8 @@ "key": "playerinfor_barrage_315", "text": "我看这魔法不是很疼。" }, - "time": 743, - "speed": 10697 + "time": 673, + "speed": 11411 }, { "id": "316", @@ -189,7 +189,7 @@ "text": "据说它的作用是封印灵魂?" }, "time": 847, - "speed": 11797 + "speed": 12439 }, { "id": "317", @@ -200,8 +200,8 @@ "key": "playerinfor_barrage_317", "text": "月中人的传承居然这么可怕?!" }, - "time": 974, - "speed": 9460 + "time": 972, + "speed": 12868 }, { "id": "318", @@ -212,8 +212,8 @@ "key": "playerinfor_barrage_318", "text": "哦!你们真是够了!" }, - "time": 1163, - "speed": 12597 + "time": 1166, + "speed": 9188 }, { "id": "319", @@ -224,8 +224,8 @@ "key": "playerinfor_barrage_319", "text": "照相不是魔法!也不能封印灵魂!" }, - "time": 1373, - "speed": 12210 + "time": 1390, + "speed": 8122 }, { "id": "320", @@ -236,8 +236,8 @@ "key": "playerinfor_barrage_320", "text": "那她是在干什么?" }, - "time": 1550, - "speed": 11734 + "time": 1541, + "speed": 11969 }, { "id": "321", @@ -248,8 +248,8 @@ "key": "playerinfor_barrage_321", "text": "……别问。" }, - "time": 1708, - "speed": 11886 + "time": 1733, + "speed": 11829 }, { "id": "322", @@ -260,8 +260,8 @@ "key": "playerinfor_barrage_322", "text": "那可以教我吗?" }, - "time": 1852, - "speed": 10410 + "time": 1881, + "speed": 7651 }, { "id": "323", @@ -272,8 +272,8 @@ "key": "playerinfor_barrage_323", "text": "我也想学。" }, - "time": 1967, - "speed": 10289 + "time": 2078, + "speed": 9810 }, { "id": "324", @@ -284,7 +284,7 @@ "key": "playerinfor_barrage_324", "text": "要不你们问问这个传承者?" }, - "time": 2203, - "speed": 12919 + "time": 2194, + "speed": 10247 } ] \ No newline at end of file diff --git a/bin/json/game_playerinfor_overview.json b/bin/json/game_playerinfor_overview.json index af6c13d4a..15d7e33f9 100644 --- a/bin/json/game_playerinfor_overview.json +++ b/bin/json/game_playerinfor_overview.json @@ -76,8 +76,8 @@ "translate": 2, "sex": 1, "type": 1, - "icon": "tx_js_nz_hzr", - "playerhead": "sbkp_js_nz_hzr", + "icon": "sbkp_js_nz_hzr", + "playerhead": "tx_js_nz_hzr", "tujing": [ 107 ], @@ -100,8 +100,8 @@ "translate": 2, "sex": 2, "type": 1, - "icon": "tx_js_nvz_hzr", - "playerhead": "sbkp_js_nvz_hzr", + "icon": "sbkp_js_nvz_hzr", + "playerhead": "tx_js_nvz_hzr", "tujing": [ 107 ], @@ -124,8 +124,8 @@ "translate": 3, "sex": 1, "type": 1, - "icon": "tx_js_nz_hr", - "playerhead": "sbkp_js_nz_hr", + "icon": "sbkp_js_nz_hr", + "playerhead": "tx_js_nz_hr", "tujing": [ 107 ], @@ -148,8 +148,8 @@ "translate": 3, "sex": 2, "type": 1, - "icon": "tx_js_nvz_hr", - "playerhead": "sbkp_js_nvz_hr", + "icon": "sbkp_js_nvz_hr", + "playerhead": "tx_js_nvz_hr", "tujing": [ 107 ], diff --git a/bin/json/game_recharge.json b/bin/json/game_recharge.json index 24f72e27f..c0ec6ddc5 100644 --- a/bin/json/game_recharge.json +++ b/bin/json/game_recharge.json @@ -5,20 +5,8 @@ "editionid": "debug", "monetaryunit": "¥", "amount": 600, - "vipexp": [ - { - "a": "attr", - "t": "diamond", - "n": 60 - } - ], - "diamond_num_double": [ - { - "a": "attr", - "t": "diamond", - "n": 60 - } - ], + "vipexp": [], + "diamond_num_double": [], "channel": "0", "text": "0", "show": "6元", @@ -31,20 +19,8 @@ "editionid": "debug", "monetaryunit": "¥", "amount": 3000, - "vipexp": [ - { - "a": "attr", - "t": "diamond", - "n": 300 - } - ], - "diamond_num_double": [ - { - "a": "attr", - "t": "diamond", - "n": 300 - } - ], + "vipexp": [], + "diamond_num_double": [], "channel": "0", "text": "0", "show": "30元", @@ -57,20 +33,8 @@ "editionid": "debug", "monetaryunit": "¥", "amount": 6800, - "vipexp": [ - { - "a": "attr", - "t": "diamond", - "n": 680 - } - ], - "diamond_num_double": [ - { - "a": "attr", - "t": "diamond", - "n": 680 - } - ], + "vipexp": [], + "diamond_num_double": [], "channel": "0", "text": "0", "show": "68元", @@ -83,20 +47,8 @@ "editionid": "debug", "monetaryunit": "¥", "amount": 9800, - "vipexp": [ - { - "a": "attr", - "t": "diamond", - "n": 980 - } - ], - "diamond_num_double": [ - { - "a": "attr", - "t": "diamond", - "n": 980 - } - ], + "vipexp": [], + "diamond_num_double": [], "channel": "0", "text": "0", "show": "98元", @@ -109,20 +61,8 @@ "editionid": "debug", "monetaryunit": "¥", "amount": 12800, - "vipexp": [ - { - "a": "attr", - "t": "diamond", - "n": 1280 - } - ], - "diamond_num_double": [ - { - "a": "attr", - "t": "diamond", - "n": 1280 - } - ], + "vipexp": [], + "diamond_num_double": [], "channel": "0", "text": "0", "show": "128元", @@ -135,20 +75,8 @@ "editionid": "debug", "monetaryunit": "¥", "amount": 19800, - "vipexp": [ - { - "a": "attr", - "t": "diamond", - "n": 1980 - } - ], - "diamond_num_double": [ - { - "a": "attr", - "t": "diamond", - "n": 1980 - } - ], + "vipexp": [], + "diamond_num_double": [], "channel": "0", "text": "0", "show": "198元", @@ -161,20 +89,8 @@ "editionid": "debug", "monetaryunit": "¥", "amount": 32800, - "vipexp": [ - { - "a": "attr", - "t": "diamond", - "n": 3280 - } - ], - "diamond_num_double": [ - { - "a": "attr", - "t": "diamond", - "n": 3280 - } - ], + "vipexp": [], + "diamond_num_double": [], "channel": "0", "text": "0", "show": "328元", @@ -187,20 +103,8 @@ "editionid": "debug", "monetaryunit": "¥", "amount": 64800, - "vipexp": [ - { - "a": "attr", - "t": "diamond", - "n": 6480 - } - ], - "diamond_num_double": [ - { - "a": "attr", - "t": "diamond", - "n": 6480 - } - ], + "vipexp": [], + "diamond_num_double": [], "channel": "0", "text": "0", "show": "648元", diff --git a/modules/realarena/api_danreceive.go b/modules/realarena/api_danreceive.go index a6966fe00..c7f9df228 100644 --- a/modules/realarena/api_danreceive.go +++ b/modules/realarena/api_danreceive.go @@ -21,7 +21,7 @@ func (this *apiComp) DanReceiveCheck(session comm.IUserSession, req *pb.ArenaDan // /获取自己的排行榜信息 func (this *apiComp) DanReceive(session comm.IUserSession, req *pb.ArenaDanReceiveReq) (errdata *pb.ErrorData) { var ( - conf *cfg.GameArenaActiveRewardData + conf *cfg.GameArenarealtimeConfigData info *pb.DBRealArena err error atno []*pb.UserAtno diff --git a/modules/realarena/configure.go b/modules/realarena/configure.go index 9fe74c1ee..2e6ec7a19 100644 --- a/modules/realarena/configure.go +++ b/modules/realarena/configure.go @@ -35,7 +35,27 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp } //查询积分段位信息 -func (this *configureComp) getGameArenarealtimeConfig(dan int32) (conf *cfg.GameArenaActiveRewardData, err error) { +func (this *configureComp) getGameArenarealtimeConfigByIntegral(integral int32) (conf *cfg.GameArenarealtimeConfigData, err error) { + var ( + v interface{} + ) + if v, err = this.GetConfigure(game_arenarealtimeconfig); err != nil { + this.module.Errorln(err) + } else { + for _, conf = range v.(*cfg.GameArenarealtimeConfig).GetDataList() { + if integral >= conf.RankMin && integral <= conf.RankMax { + return + } + } + err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_arenarealtimeconfig, integral) + this.module.Errorln(err) + return + } + return +} + +//查询积分段位信息 +func (this *configureComp) getGameArenarealtimeConfig(dan int32) (conf *cfg.GameArenarealtimeConfigData, err error) { var ( v interface{} ok bool @@ -43,7 +63,7 @@ func (this *configureComp) getGameArenarealtimeConfig(dan int32) (conf *cfg.Game if v, err = this.GetConfigure(game_arenarealtimeconfig); err != nil { this.module.Errorln(err) } else { - if conf, ok = v.(*cfg.GameArenaActiveReward).GetDataMap()[dan]; !ok { + if conf, ok = v.(*cfg.GameArenarealtimeConfig).GetDataMap()[dan]; !ok { err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_arenarealtimeconfig, dan) this.module.Errorln(err) return diff --git a/modules/realarena/model.go b/modules/realarena/model.go index 8a388f48f..31e5b0918 100644 --- a/modules/realarena/model.go +++ b/modules/realarena/model.go @@ -83,12 +83,24 @@ func (this *modelComp) change(uid string, update map[string]interface{}) (err er return } -// 积分计算 -func (this *modelComp) integralCompute(red, bule *pb.ArenaPlayer, iswin bool) { +func (this *modelComp) computedan(integral int32) (dan int32, err error) { var ( - redactive *cfg.GameArenaActiveRewardData - buleactive *cfg.GameArenaActiveRewardData - err error + active *cfg.GameArenarealtimeConfigData + ) + + if active, err = this.module.configure.getGameArenarealtimeConfigByIntegral(integral); err != nil { + this.module.Errorln(err) + return + } + dan = active.Id + return +} + +// 积分计算 +func (this *modelComp) integralCompute(red, bule *pb.DBRealArenaMember, winside int32) (err error) { + var ( + redactive *cfg.GameArenarealtimeConfigData + buleactive *cfg.GameArenarealtimeConfigData ) if redactive, err = this.module.configure.getGameArenarealtimeConfig(red.Dan); err != nil { this.module.Errorln(err) @@ -98,26 +110,32 @@ func (this *modelComp) integralCompute(red, bule *pb.ArenaPlayer, iswin bool) { this.module.Errorln(err) return } - if iswin { - red.Changeintegral = int32(float64(redactive.KValue) * float64(1-1/float32(1+math.Pow(10, float64(float64(bule.Integral-red.Integral)/400))))) - bule.Changeintegral = int32(float64(buleactive.KValue) * float64(0-1/float64(1+math.Pow(10, float64(float64(red.Integral-bule.Integral))/400)))) + if winside == 1 { + red.Addintegral = int32(float64(redactive.Kscore) * float64(1-1/float32(1+math.Pow(10, float64(float64(bule.Integral-red.Integral)/400))))) + bule.Addintegral = int32(float64(buleactive.Kscore) * float64(0-1/float64(1+math.Pow(10, float64(float64(red.Integral-bule.Integral))/400)))) } else { - red.Changeintegral = int32(float64(redactive.KValue) * float64(0-1/float64(1+math.Pow(10, float64(float64(bule.Integral-red.Integral)/400))))) - bule.Changeintegral = int32(float64(redactive.KValue) * float64(1-1/float64(1+math.Pow(10, float64(float64(red.Integral-bule.Integral)/400))))) + red.Addintegral = int32(float64(redactive.Kscore) * float64(0-1/float64(1+math.Pow(10, float64(float64(bule.Integral-red.Integral)/400))))) + bule.Addintegral = int32(float64(redactive.Kscore) * float64(1-1/float64(1+math.Pow(10, float64(float64(red.Integral-bule.Integral)/400))))) } - if red.Integral+red.Changeintegral < 0 { - red.Changeintegral = -red.Integral + if red.Integral+red.Addintegral < 0 { + red.Addintegral = -red.Integral red.Integral = 0 } else { - red.Integral = red.Integral + red.Changeintegral + red.Integral = red.Integral + red.Addintegral } - if bule.Integral+bule.Changeintegral < 0 { - bule.Changeintegral = -bule.Integral + if bule.Integral+bule.Addintegral < 0 { + bule.Addintegral = -bule.Integral bule.Integral = 0 } else { - bule.Integral = bule.Integral + bule.Changeintegral + bule.Integral = bule.Integral + bule.Addintegral } - + if red.Dan, err = this.computedan(red.Integral); err != nil { + return + } + if bule.Dan, err = this.computedan(bule.Integral); err != nil { + return + } + return } // 埋点专属模型 会封装特殊的数据转换接口 diff --git a/modules/realarena/modelrank.go b/modules/realarena/modelrank.go index cbe39a04f..7bb73b47d 100644 --- a/modules/realarena/modelrank.go +++ b/modules/realarena/modelrank.go @@ -7,6 +7,7 @@ import ( "go_dreamfactory/lego/core" "go_dreamfactory/lego/sys/redis/pipe" "go_dreamfactory/modules" + "go_dreamfactory/pb" "go_dreamfactory/sys/db" "github.com/go-redis/redis/v8" @@ -32,17 +33,26 @@ func (this *modelRank) rankey() string { } // 更新排名 -func (this *modelRank) updateArenaRank(uid string, integral int32) (rank int64, err error) { + +// 更新排名 +func (this *modelRank) updateArenaRank(users ...*pb.DBRealArenaMember) (err error) { var ( pipe *pipe.RedisPipe = this.DBModel.Redis.RedisPipe(context.TODO()) + menbers []*redis.Z cmd *redis.IntCmd - menbersCmd *redis.IntCmd + menbersCmd []*redis.IntCmd = make([]*redis.IntCmd, len(users)) + rank int64 ) - - if cmd = pipe.ZAdd(this.rankey(), &redis.Z{Score: float64(integral), Member: uid}); err != nil { + menbers = make([]*redis.Z, len(users)) + for i, v := range users { + menbers[i] = &redis.Z{Score: float64(v.Integral), Member: v.User.Uid} + } + if cmd = pipe.ZAdd(this.rankey(), menbers...); err != nil { this.module.Errorln(err) } - menbersCmd = pipe.ZRevRank(this.rankey(), uid) + for i, v := range users { + menbersCmd[i] = pipe.ZRevRank(this.rankey(), v.User.Uid) + } if _, err = pipe.Exec(); err != nil { this.module.Errorln(err) return @@ -51,12 +61,13 @@ func (this *modelRank) updateArenaRank(uid string, integral int32) (rank int64, this.module.Errorln(err) return } - - if rank, err = menbersCmd.Result(); err != nil { - this.module.Errorln(err) - return + for i, v := range menbersCmd { + if rank, err = v.Result(); err != nil { + this.module.Errorln(err) + return + } + users[i].Rank = int32(rank + 1) } - rank = rank + 1 return } diff --git a/modules/realarena/module.go b/modules/realarena/module.go index 2e0a1d23c..be908988b 100644 --- a/modules/realarena/module.go +++ b/modules/realarena/module.go @@ -180,32 +180,14 @@ func (this *RealArena) endgame(ctx context.Context, req *pb.RPC_RealArenaTrustee //战斗结束 func (this *RealArena) ChallengeResults(roomid, red, bule string, winSide int32) { var ( - // room *Room - ok bool - err error + room *Room + ok bool ) this.lock.Lock() - _, ok = this.rooms[roomid] + room, ok = this.rooms[roomid] delete(this.rooms, roomid) this.lock.Unlock() if ok { - if err = this.model.change(red, map[string]interface{}{ - "state": 0, - "roomid": "", - "roompath": "", - "integral": 0, - }); err != nil { - this.Errorln(err) - return - } - if err = this.model.change(bule, map[string]interface{}{ - "state": 0, - "roomid": "", - "roompath": "", - "integral": 0, - }); err != nil { - this.Errorln(err) - return - } + room.ChallengeResults(winSide) } } diff --git a/modules/realarena/romm.go b/modules/realarena/romm.go index afc70d9f2..c68b88977 100644 --- a/modules/realarena/romm.go +++ b/modules/realarena/romm.go @@ -4,6 +4,7 @@ import ( "fmt" "go_dreamfactory/comm" "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" "google.golang.org/protobuf/proto" ) @@ -148,6 +149,87 @@ func (this *Room) selectleader(uid string, index int32) (err error) { } func (this *Room) UserOffline(uid string) { + var winSide int32 = 1 + if this.members[0].User.Uid == uid { + winSide = 2 + } + this.module.ChallengeResults(this.Id, this.members[0].User.Uid, this.members[1].User.Uid, winSide) +} + +func (this *Room) ChallengeResults(winSide int32) { + var ( + conf *cfg.GameArenarealtimeConfigData + errdata *pb.ErrorData + err error + ) + this.module.model.integralCompute(this.members[0], this.members[1], winSide) + this.module.modelRank.updateArenaRank(this.members...) + if err = this.module.model.change(this.members[0].User.Uid, map[string]interface{}{ + "state": 0, + "roomid": "", + "roompath": "", + "rank": this.members[0].Rank, + "dan": this.members[0].Dan, + "integral": this.members[0].Integral, + }); err != nil { + this.module.Errorln(err) + return + } + if err = this.module.model.change(this.members[1].User.Uid, map[string]interface{}{ + "state": 0, + "roomid": "", + "roompath": "", + "rank": this.members[1].Rank, + "dan": this.members[1].Dan, + "integral": this.members[1].Integral, + }); err != nil { + this.module.Errorln(err) + return + } + + if winSide == 1 { + if conf, err = this.module.configure.getGameArenarealtimeConfig(this.members[0].Dan); err != nil { + this.module.Errorln(err) + return + } + if errdata, this.members[0].Award = this.module.DispenseAtno(this.sessions[0], conf.WinReward, true); errdata != nil { + this.module.Errorln(errdata) + return + } + if conf, err = this.module.configure.getGameArenarealtimeConfig(this.members[1].Dan); err != nil { + this.module.Errorln(err) + return + } + if errdata, this.members[1].Award = this.module.DispenseAtno(this.sessions[1], conf.LoseReward, true); errdata != nil { + this.module.Errorln(errdata) + return + } + } else { + if conf, err = this.module.configure.getGameArenarealtimeConfig(this.members[0].Dan); err != nil { + this.module.Errorln(err) + return + } + if errdata, this.members[0].Award = this.module.DispenseAtno(this.sessions[0], conf.LoseReward, true); errdata != nil { + this.module.Errorln(errdata) + return + } + if conf, err = this.module.configure.getGameArenarealtimeConfig(this.members[1].Dan); err != nil { + this.module.Errorln(err) + return + } + if errdata, this.members[1].Award = this.module.DispenseAtno(this.sessions[1], conf.WinReward, true); errdata != nil { + this.module.Errorln(errdata) + return + } + } + for _, v := range this.sessions { + v.Push() + } + this.PushMessage("battlefinish", &pb.RealArenaBattleFinishPush{ + Winside: winSide, + Red: this.members[0], + Bule: this.members[1], + }) } diff --git a/pb/realarena_db.pb.go b/pb/realarena_db.pb.go index 8b910920b..5303dacca 100644 --- a/pb/realarena_db.pb.go +++ b/pb/realarena_db.pb.go @@ -29,12 +29,13 @@ type DBRealArena struct { Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` //uid Uinfo *BaseUserInfo `protobuf:"bytes,3,opt,name=uinfo,proto3" json:"uinfo"` //用户基础 - Dan int32 `protobuf:"varint,4,opt,name=dan,proto3" json:"dan"` //段位 - Integral int32 `protobuf:"varint,5,opt,name=integral,proto3" json:"integral"` //积分 - Danaward map[int32]int32 `protobuf:"bytes,6,rep,name=danaward,proto3" json:"danaward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //段位奖励 - State int32 `protobuf:"varint,7,opt,name=state,proto3" json:"state"` //队伍状态 0 空闲 1匹配中 2游戏中 - Roompath string `protobuf:"bytes,8,opt,name=roompath,proto3" json:"roompath"` //房间地址 - Roomid string `protobuf:"bytes,9,opt,name=roomid,proto3" json:"roomid"` //房间id + Rank int32 `protobuf:"varint,4,opt,name=rank,proto3" json:"rank"` //排名 + Dan int32 `protobuf:"varint,5,opt,name=dan,proto3" json:"dan"` //段位 + Integral int32 `protobuf:"varint,6,opt,name=integral,proto3" json:"integral"` //积分 + Danaward map[int32]int32 `protobuf:"bytes,7,rep,name=danaward,proto3" json:"danaward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //段位奖励 + State int32 `protobuf:"varint,8,opt,name=state,proto3" json:"state"` //队伍状态 0 空闲 1匹配中 2游戏中 + Roompath string `protobuf:"bytes,9,opt,name=roompath,proto3" json:"roompath"` //房间地址 + Roomid string `protobuf:"bytes,10,opt,name=roomid,proto3" json:"roomid"` //房间id } func (x *DBRealArena) Reset() { @@ -90,6 +91,13 @@ func (x *DBRealArena) GetUinfo() *BaseUserInfo { return nil } +func (x *DBRealArena) GetRank() int32 { + if x != nil { + return x.Rank + } + return 0 +} + func (x *DBRealArena) GetDan() int32 { if x != nil { return x.Dan @@ -139,9 +147,10 @@ type DBRealArenaMember struct { unknownFields protoimpl.UnknownFields User *BaseUserInfo `protobuf:"bytes,1,opt,name=user,proto3" json:"user"` //发起者信息 - Dan int32 `protobuf:"varint,2,opt,name=dan,proto3" json:"dan"` //段位 - Integral int32 `protobuf:"varint,3,opt,name=integral,proto3" json:"integral"` //积分 - Heros []string `protobuf:"bytes,4,rep,name=heros,proto3" json:"heros"` //队伍 + Rank int32 `protobuf:"varint,2,opt,name=rank,proto3" json:"rank"` //排名 + Dan int32 `protobuf:"varint,3,opt,name=dan,proto3" json:"dan"` //段位 + Integral int32 `protobuf:"varint,4,opt,name=integral,proto3" json:"integral"` //积分 + Heros []string `protobuf:"bytes,5,rep,name=heros,proto3" json:"heros"` //队伍 Disable int32 `protobuf:"varint,6,opt,name=disable,proto3" json:"disable"` //禁用 Leader int32 `protobuf:"varint,7,opt,name=leader,proto3" json:"leader"` //队长 Addintegral int32 `protobuf:"varint,8,opt,name=addintegral,proto3" json:"addintegral"` //当局获得积分 @@ -187,6 +196,13 @@ func (x *DBRealArenaMember) GetUser() *BaseUserInfo { return nil } +func (x *DBRealArenaMember) GetRank() int32 { + if x != nil { + return x.Rank + } + return 0 +} + func (x *DBRealArenaMember) GetDan() int32 { if x != nil { return x.Dan @@ -313,53 +329,55 @@ var File_realarena_realarena_db_proto protoreflect.FileDescriptor var file_realarena_realarena_db_proto_rawDesc = []byte{ 0x0a, 0x1c, 0x72, 0x65, 0x61, 0x6c, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x2f, 0x72, 0x65, 0x61, 0x6c, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, - 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc1, 0x02, 0x0a, 0x0b, 0x44, + 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd5, 0x02, 0x0a, 0x0b, 0x44, 0x42, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 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, 0x23, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x75, 0x69, 0x6e, 0x66, - 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, - 0x64, 0x61, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, - 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, - 0x36, 0x0a, 0x08, 0x64, 0x61, 0x6e, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x06, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x2e, - 0x44, 0x61, 0x6e, 0x61, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x64, - 0x61, 0x6e, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, - 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1a, 0x0a, - 0x08, 0x72, 0x6f, 0x6f, 0x6d, 0x70, 0x61, 0x74, 0x68, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x08, 0x72, 0x6f, 0x6f, 0x6d, 0x70, 0x61, 0x74, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, - 0x6d, 0x69, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, - 0x64, 0x1a, 0x3b, 0x0a, 0x0d, 0x44, 0x61, 0x6e, 0x61, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xef, - 0x01, 0x0a, 0x11, 0x44, 0x42, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d, 0x65, - 0x6d, 0x62, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, - 0x6f, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x6e, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, - 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, - 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x18, 0x04, - 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x64, - 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, - 0x73, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x6c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, - 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x20, 0x0a, - 0x0b, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x08, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x0b, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, - 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, - 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, - 0x22, 0x91, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, - 0x52, 0x61, 0x63, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x02, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, - 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x24, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, - 0x61, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x03, 0x72, 0x65, 0x64, 0x12, 0x26, 0x0a, 0x04, - 0x62, 0x75, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x52, - 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x04, - 0x62, 0x75, 0x6c, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x6e, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, + 0x72, 0x61, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, + 0x72, 0x61, 0x6c, 0x12, 0x36, 0x0a, 0x08, 0x64, 0x61, 0x6e, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, + 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, + 0x65, 0x6e, 0x61, 0x2e, 0x44, 0x61, 0x6e, 0x61, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x52, 0x08, 0x64, 0x61, 0x6e, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, + 0x74, 0x61, 0x74, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, + 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x6f, 0x6f, 0x6d, 0x70, 0x61, 0x74, 0x68, 0x18, 0x09, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x08, 0x72, 0x6f, 0x6f, 0x6d, 0x70, 0x61, 0x74, 0x68, 0x12, 0x16, 0x0a, + 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, + 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x1a, 0x3b, 0x0a, 0x0d, 0x44, 0x61, 0x6e, 0x61, 0x77, 0x61, 0x72, + 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, + 0x38, 0x01, 0x22, 0x83, 0x02, 0x0a, 0x11, 0x44, 0x42, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, + 0x6e, 0x61, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, + 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x72, + 0x61, 0x6e, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x12, + 0x10, 0x0a, 0x03, 0x64, 0x61, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, + 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x14, 0x0a, + 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x68, 0x65, + 0x72, 0x6f, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x06, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x16, 0x0a, + 0x06, 0x6c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6c, + 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x74, 0x65, + 0x67, 0x72, 0x61, 0x6c, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x61, 0x64, 0x64, 0x69, + 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, + 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, + 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x91, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x52, + 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52, 0x61, 0x63, 0x65, 0x12, 0x0e, 0x0a, 0x02, + 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x24, + 0x0a, 0x03, 0x72, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, + 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, + 0x03, 0x72, 0x65, 0x64, 0x12, 0x26, 0x0a, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, + 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x42, 0x06, 0x5a, 0x04, + 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/sys/configure/structs/Game.ArenarealtimeConfigData.go b/sys/configure/structs/Game.ArenarealtimeConfigData.go index dfa3868fd..5aaf69b72 100644 --- a/sys/configure/structs/Game.ArenarealtimeConfigData.go +++ b/sys/configure/structs/Game.ArenarealtimeConfigData.go @@ -19,11 +19,11 @@ type GameArenarealtimeConfigData struct { RankMax int32 ExReward []*Gameatn RankReturn int32 - RewardWeek []*Gameatn WinReward []*Gameatn WinRankScore int32 LoseReward []*Gameatn LoseRankScore int32 + Kscore int32 RankIcon string } @@ -55,20 +55,6 @@ func (_v *GameArenarealtimeConfigData)Deserialize(_buf map[string]interface{}) ( } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["RankReturn"].(float64); !_ok_ { err = errors.New("RankReturn error"); return }; _v.RankReturn = int32(_tempNum_) } - { - var _arr_ []interface{} - var _ok_ bool - if _arr_, _ok_ = _buf["reward_week"].([]interface{}); !_ok_ { err = errors.New("reward_week error"); return } - - _v.RewardWeek = make([]*Gameatn, 0, len(_arr_)) - - for _, _e_ := range _arr_ { - var _list_v_ *Gameatn - { 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 = DeserializeGameatn(_x_); err != nil { return } } - _v.RewardWeek = append(_v.RewardWeek, _list_v_) - } - } - { var _arr_ []interface{} var _ok_ bool @@ -99,6 +85,7 @@ func (_v *GameArenarealtimeConfigData)Deserialize(_buf map[string]interface{}) ( } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["LoseRankScore"].(float64); !_ok_ { err = errors.New("LoseRankScore error"); return }; _v.LoseRankScore = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Kscore"].(float64); !_ok_ { err = errors.New("Kscore error"); return }; _v.Kscore = int32(_tempNum_) } { var _ok_ bool; if _v.RankIcon, _ok_ = _buf["RankIcon"].(string); !_ok_ { err = errors.New("RankIcon error"); return } } return }