diff --git a/bin/json/game_gamesummary.json b/bin/json/game_gamesummary.json index 3db518a0f..bbee1b88e 100644 --- a/bin/json/game_gamesummary.json +++ b/bin/json/game_gamesummary.json @@ -3,7 +3,7 @@ "id": 1, "name": { "key": "gamesummary_node_name_1", - "text": "冒险关卡" + "text": "冒险故事" }, "tabId": 2, "mapPos": { @@ -15,7 +15,7 @@ "jumpId": 166, "introduce": { "key": "gamesummary_node_introdunce_1", - "text": "冒险关卡" + "text": "故事的开始起于一场冒险，但后来这个故事里不但有冒险，还有友谊和爱。" }, "bg": "hkz_wftj_zxgk", "icon": "Attack", @@ -48,7 +48,7 @@ "jumpId": 10015, "introduce": { "key": "gamesummary_node_introdunce_2", - "text": "竞技场" + "text": "一流剑客靴猫喜欢比武，他在此建立了一个竞技场，看看城中谁才是最强。" }, "bg": "hkz_wftj_jjc", "icon": "rw_cj_icon09", @@ -76,7 +76,7 @@ "jumpId": 10023, "introduce": { "key": "gamesummary_node_introdunce_3", - "text": "狩猎-巨型猩猩" + "text": "月圆之夜，它带着饥饿与愤怒而来。只有堆积如山的香蕉能平息它的怒火。" }, "bg": "hkz_wftj_sl02", "icon": "wjyz_img016", @@ -114,7 +114,7 @@ "jumpId": 10025, "introduce": { "key": "gamesummary_node_introdunce_4", - "text": "狩猎-大厨" + "text": "大厨因为没抓到精灵们而被放逐，对精灵恨之入骨，誓要将精灵赶尽杀绝。" }, "bg": "hkz_wftj_sl01", "icon": "wjyz_img014", @@ -140,7 +140,7 @@ "id": 5, "name": { "key": "gamesummary_node_name_5", - "text": "狩猎-太空海星" + "text": "狩猎-戈格星人" }, "tabId": 4, "mapPos": { @@ -152,7 +152,7 @@ "jumpId": 10026, "introduce": { "key": "gamesummary_node_introdunce_5", - "text": "狩猎-太空海星" + "text": "波波星人带走了戈格星人的孩子，自此戈格星人开始了对波波星人的追击之旅。" }, "bg": "hkz_wftj_sl03", "icon": "wjyz_img017", @@ -190,7 +190,7 @@ "jumpId": 10024, "introduce": { "key": "gamesummary_node_introdunce_6", - "text": "狩猎-火龙" + "text": "盘踞在城堡中看守着财富和公主的巨龙，最讨厌一些不速之客擅闯她的领地。" }, "bg": "hkz_wftj_sl04", "icon": "wjyz_img015", @@ -228,7 +228,7 @@ "jumpId": 10022, "introduce": { "key": "gamesummary_node_introdunce_7", - "text": "维京远征-火焰泰坦" + "text": "贝洛克唤醒沉睡千年的火焰泰坦，火焰将大地燃烧殆尽，三泰坦一旦汇合，世界将因此毁灭。" }, "bg": "hkz_wftj_wjyz03", "icon": "wjyz_img012", @@ -271,7 +271,7 @@ "jumpId": 10020, "introduce": { "key": "gamesummary_node_introdunce_8", - "text": "维京远征-冰霜泰坦" + "text": "斯卡尔唤醒沉睡千年的冰霜泰坦，所过之处皆冻结出寒冷的冰山，三泰坦一旦汇合，世界将因此毁灭。" }, "bg": "hkz_wftj_wjyz02", "icon": "wjyz_img011", @@ -314,7 +314,7 @@ "jumpId": 10021, "introduce": { "key": "gamesummary_node_introdunce_9", - "text": "维京远征-森林泰坦" + "text": "贝洛克与斯卡尔胁迫娜璃唤醒沉睡千年的森林泰坦，藤蔓蜿蜒千里，三泰坦一旦汇合，世界将因此毁灭。" }, "bg": "hkz_wftj_wjyz01", "icon": "wjyz_img013", @@ -357,7 +357,7 @@ "jumpId": 10013, "introduce": { "key": "gamesummary_node_introdunce_10", - "text": "梦境回廊" + "text": "美丽，梦幻与诡异兼具，这便是沙人建造的梦境回廊。守护者们可在此磨练技艺。" }, "bg": "hkz_wftj_jyfb", "icon": "wjyz_img011", @@ -383,7 +383,7 @@ "id": 11, "name": { "key": "gamesummary_node_name_11", - "text": "功夫大师挑战塔" + "text": "炼金塔" }, "tabId": 6, "mapPos": { @@ -395,7 +395,7 @@ "jumpId": 10004, "introduce": { "key": "gamesummary_node_introdunce_11", - "text": "功夫大师挑战塔" + "text": "顽石需历经千锤百炼，方可提炼成金。这里是师傅为挑战自我者而修建的地方。" }, "bg": "hkz_wftj_wjyz01", "icon": "fb_rk_wj1", @@ -421,7 +421,7 @@ "id": 12, "name": { "key": "gamesummary_node_name_12", - "text": "功夫大师循环塔" + "text": "无极塔" }, "tabId": 6, "mapPos": { @@ -433,7 +433,7 @@ "jumpId": 10017, "introduce": { "key": "gamesummary_node_introdunce_12", - "text": "功夫大师循环塔" + "text": "无穷无尽的试炼，越来越棘手的对手。这里是师傅为穷尽武道者而修建的地方。" }, "bg": "hkz_wftj_wjyz01", "icon": "fb_rk_wj1", @@ -454,7 +454,7 @@ "id": 13, "name": { "key": "gamesummary_node_name_13", - "text": "功夫大师阵营塔" + "text": "六合塔" }, "tabId": 6, "mapPos": { @@ -466,7 +466,7 @@ "jumpId": 10018, "introduce": { "key": "gamesummary_node_introdunce_13", - "text": "功夫大师阵营塔" + "text": "天下万物，相生相克。掌握了相克的原理，以弱胜强者不在少数。这里是师傅为研究阵营克制者而修建的地方。" }, "bg": "hkz_wftj_wjyz01", "icon": "fb_rk_wj1", @@ -499,7 +499,7 @@ "jumpId": 11001, "introduce": { "key": "gamesummary_node_introdunce_14", - "text": "巨怪商队" + "text": "去往神秘的远方，探索未知的宇宙，交易珍稀的宝藏！为了充实巨怪市集，巨怪们踏上了列车，开启了漫长的旅途。" }, "bg": "hkz_wftj_jsg", "icon": "rw_cj_icon16", @@ -532,7 +532,7 @@ "jumpId": 10027, "introduce": { "key": "gamesummary_node_introdunce_16", - "text": "石阵秘境" + "text": "史前板块运动形成的天然巨石阵迷宫，道路错综复杂，幽深莫测，原始人们是如何从这里逃出生天的呢？" }, "bg": "hkz_wftj_jsg", "icon": "rw_cj_icon01", diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 9ed14881e..f1a364057 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -14684,7 +14684,7 @@ "id": "10000036", "name": { "key": "item_item_name_369", - "text": "石阵玩法货币" + "text": "宝螺贝" }, "usetype": 1, "color": 5, @@ -14707,7 +14707,7 @@ "img": "item_10000035", "intr": { "key": "item_item_intr_378", - "text": "暂无包装" + "text": "原始社会最常见的货币，在搁浅的沙滩上很容易找到它。光滑小巧的个头方便携带，又受人们喜爱。" }, "sale": [ { @@ -14721,7 +14721,7 @@ "id": "10000037", "name": { "key": "item_item_name_370", - "text": "石阵天赋树货币" + "text": "智慧水晶" }, "usetype": 1, "color": 5, @@ -14744,7 +14744,7 @@ "img": "item_10000035", "intr": { "key": "item_item_intr_379", - "text": "暂无包装" + "text": "迷宫中的美丽水晶，波澜浮光的棕红，是石洞天然形成的瑰宝。它拥有特殊的能量，将它握在手中，能使感官大幅度增强。（注意要和巨怪商队中的画的不一样）" }, "sale": [ { @@ -14781,7 +14781,7 @@ "img": "item_10000035", "intr": { "key": "item_item_intr_380", - "text": "暂无包装" + "text": "鹦鹉螺较为罕见，又因其外形精巧美丽，因此成为稀缺货币的代名词。人们即使历经磨难也只能得到很少的鹦鹉螺，收到它作为奖励是一件非常自豪骄傲的事。" }, "sale": [ { @@ -14795,7 +14795,7 @@ "id": "22100001", "name": { "key": "item_item_name_372", - "text": "演练抽奖券" + "text": "智慧水晶" }, "usetype": 2, "color": 5, diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 79051945e..3f955139e 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -520,7 +520,7 @@ "Person/44005/44005_exhibition.prefab" ], "herocolor": 1, - "heroimg": "zxgq_js_51004", + "heroimg": "zxgq_js_33001", "bubbletext": { "key": "main_stage_bubbletext_6", "text": "吃饱喝足，快向瓜哥询问月光原石的线索！" @@ -4262,7 +4262,7 @@ 100123 ], "previoustage": 0, - "Episodetype": 7, + "Episodetype": 2, "openlevel": 1, "EditorStage": 0, "venturemodel": "", @@ -4300,13 +4300,7 @@ "hero_exp": 0, "ps_consume": [], "ps_mg": [], - "firstaward": [ - { - "a": "item", - "t": "10000001", - "n": 10 - } - ], + "firstaward": [], "lotteryward": 0, "commonaward": [], "BattleReadyID": 0, @@ -4321,9 +4315,7 @@ "chapterid": 11001, "group_id": 100125, "previous_group_id": [ - 100121, - 100122, - 100123 + 100109 ], "previoustage": 0, "Episodetype": 5, @@ -4364,7 +4356,13 @@ "hero_exp": 0, "ps_consume": [], "ps_mg": [], - "firstaward": [], + "firstaward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + } + ], "lotteryward": 0, "commonaward": [], "BattleReadyID": 0, @@ -4379,9 +4377,7 @@ "chapterid": 11001, "group_id": 100126, "previous_group_id": [ - 100121, - 100122, - 100123 + 100109 ], "previoustage": 0, "Episodetype": 7, @@ -4397,7 +4393,7 @@ "text": "测试节点9" }, "animation": "", - "hide": 0, + "hide": 1, "destroy": 1, "progress": 0, "frontstoryid": 0, @@ -4426,7 +4422,7 @@ { "a": "item", "t": "10000001", - "n": 10 + "n": 1 } ], "lotteryward": 0, @@ -4443,9 +4439,7 @@ "chapterid": 11001, "group_id": 100127, "previous_group_id": [ - 100121, - 100122, - 100123 + 100112 ], "previoustage": 0, "Episodetype": 5, @@ -5243,9 +5237,7 @@ "chapterid": 11001, "group_id": 100135, "previous_group_id": [ - 100121, - 100122, - 100123 + 100105 ], "previoustage": 0, "Episodetype": 7, @@ -5307,9 +5299,7 @@ "chapterid": 11001, "group_id": 100136, "previous_group_id": [ - 100121, - 100122, - 100123 + 100135 ], "previoustage": 0, "Episodetype": 7, @@ -5371,9 +5361,7 @@ "chapterid": 11001, "group_id": 100137, "previous_group_id": [ - 100121, - 100122, - 100123 + 100136 ], "previoustage": 0, "Episodetype": 7, @@ -5435,9 +5423,9 @@ "chapterid": 11001, "group_id": 100138, "previous_group_id": [ - 100121, - 100122, - 100123 + 100135, + 100136, + 100137 ], "previoustage": 0, "Episodetype": 7, @@ -5454,7 +5442,7 @@ }, "animation": "", "hide": 1, - "destroy": 0, + "destroy": 1, "progress": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -5499,9 +5487,7 @@ "chapterid": 11001, "group_id": 100139, "previous_group_id": [ - 100121, - 100122, - 100123 + 100103 ], "previoustage": 0, "Episodetype": 7, @@ -5517,8 +5503,8 @@ "text": "测试节点22" }, "animation": "", - "hide": 1, - "destroy": 0, + "hide": 0, + "destroy": 1, "progress": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -5563,9 +5549,7 @@ "chapterid": 11001, "group_id": 100140, "previous_group_id": [ - 100121, - 100122, - 100123 + 100139 ], "previoustage": 0, "Episodetype": 7, @@ -5581,8 +5565,8 @@ "text": "测试节点23" }, "animation": "", - "hide": 1, - "destroy": 0, + "hide": 0, + "destroy": 1, "progress": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -5627,9 +5611,7 @@ "chapterid": 11001, "group_id": 100141, "previous_group_id": [ - 100121, - 100122, - 100123 + 100140 ], "previoustage": 0, "Episodetype": 7, @@ -5645,8 +5627,8 @@ "text": "测试节点24" }, "animation": "", - "hide": 1, - "destroy": 0, + "hide": 0, + "destroy": 1, "progress": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -5691,9 +5673,7 @@ "chapterid": 11001, "group_id": 100142, "previous_group_id": [ - 100121, - 100122, - 100123 + 100141 ], "previoustage": 0, "Episodetype": 7, @@ -5710,7 +5690,7 @@ }, "animation": "", "hide": 1, - "destroy": 0, + "destroy": 1, "progress": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -5755,9 +5735,7 @@ "chapterid": 11001, "group_id": 100143, "previous_group_id": [ - 100121, - 100122, - 100123 + 100107 ], "previoustage": 0, "Episodetype": 7, @@ -5819,9 +5797,7 @@ "chapterid": 11001, "group_id": 100144, "previous_group_id": [ - 100121, - 100122, - 100123 + 100143 ], "previoustage": 0, "Episodetype": 7, @@ -5883,9 +5859,7 @@ "chapterid": 11001, "group_id": 100145, "previous_group_id": [ - 100121, - 100122, - 100123 + 100144 ], "previoustage": 0, "Episodetype": 7, @@ -5947,12 +5921,10 @@ "chapterid": 11001, "group_id": 100146, "previous_group_id": [ - 100121, - 100122, - 100123 + 100145 ], "previoustage": 0, - "Episodetype": 5, + "Episodetype": 7, "openlevel": 1, "EditorStage": 0, "venturemodel": "", @@ -5965,8 +5937,8 @@ "text": "测试节点29" }, "animation": "", - "hide": 0, - "destroy": 0, + "hide": 1, + "destroy": 1, "progress": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -5990,7 +5962,13 @@ "hero_exp": 0, "ps_consume": [], "ps_mg": [], - "firstaward": [], + "firstaward": [ + { + "a": "item", + "t": "13003004", + "n": 1 + } + ], "lotteryward": 0, "commonaward": [], "BattleReadyID": 0, @@ -6005,9 +5983,7 @@ "chapterid": 11001, "group_id": 100147, "previous_group_id": [ - 100121, - 100122, - 100123 + 100113 ], "previoustage": 0, "Episodetype": 1, @@ -6023,11 +5999,11 @@ "text": "测试节点30" }, "animation": "", - "hide": 0, + "hide": 1, "destroy": 0, "progress": 0, - "frontstoryid": 20105, - "afterstoryid": 20107, + "frontstoryid": 0, + "afterstoryid": 0, "maingroupName": { "key": "", "text": "" @@ -6111,12 +6087,10 @@ "chapterid": 11001, "group_id": 100148, "previous_group_id": [ - 100121, - 100122, - 100123 + 100150 ], "previoustage": 0, - "Episodetype": 5, + "Episodetype": 7, "openlevel": 1, "EditorStage": 0, "venturemodel": "", @@ -6129,8 +6103,8 @@ "text": "测试节点31" }, "animation": "", - "hide": 0, - "destroy": 0, + "hide": 1, + "destroy": 1, "progress": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -6154,7 +6128,13 @@ "hero_exp": 0, "ps_consume": [], "ps_mg": [], - "firstaward": [], + "firstaward": [ + { + "a": "item", + "t": "10000001", + "n": 3 + } + ], "lotteryward": 0, "commonaward": [], "BattleReadyID": 0, @@ -6169,9 +6149,7 @@ "chapterid": 11001, "group_id": 100149, "previous_group_id": [ - 100121, - 100122, - 100123 + 100107 ], "previoustage": 0, "Episodetype": 7, @@ -6188,7 +6166,7 @@ }, "animation": "", "hide": 1, - "destroy": 0, + "destroy": 1, "progress": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -6215,8 +6193,8 @@ "firstaward": [ { "a": "item", - "t": "13003004", - "n": 1 + "t": "10000001", + "n": 2 } ], "lotteryward": 0, @@ -6233,9 +6211,7 @@ "chapterid": 11001, "group_id": 100150, "previous_group_id": [ - 100121, - 100122, - 100123 + 100115 ], "previoustage": 0, "Episodetype": 7, @@ -6251,8 +6227,8 @@ "text": "测试节点33" }, "animation": "", - "hide": 1, - "destroy": 0, + "hide": 0, + "destroy": 1, "progress": 0, "frontstoryid": 0, "afterstoryid": 0, @@ -6279,7 +6255,7 @@ "firstaward": [ { "a": "item", - "t": "13001001", + "t": "10000001", "n": 1 } ], @@ -6297,9 +6273,7 @@ "chapterid": 11001, "group_id": 100151, "previous_group_id": [ - 100121, - 100122, - 100123 + 100114 ], "previoustage": 0, "Episodetype": 1, @@ -6315,7 +6289,7 @@ "text": "测试节点34" }, "animation": "", - "hide": 0, + "hide": 1, "destroy": 0, "progress": 0, "frontstoryid": 0, @@ -6398,6 +6372,77 @@ ], "challengeward": 0 }, + { + "id": 1100174, + "chapterid": 11001, + "group_id": 100152, + "previous_group_id": [ + 100150, + 100138, + 100142, + 100146 + ], + "previoustage": 0, + "Episodetype": 7, + "openlevel": 0, + "EditorStage": 0, + "venturemodel": "", + "venturetype": 0, + "ventureavatar": [], + "herocolor": 0, + "heroimg": "attr_gold", + "bubbletext": { + "key": "main_stage_bubbletext_74", + "text": "测试节点35" + }, + "animation": "", + "hide": 1, + "destroy": 0, + "progress": 0, + "frontstoryid": 0, + "afterstoryid": 0, + "maingroupName": { + "key": "", + "text": "" + }, + "mainlineName": { + "key": "mainchapter_main_stage_mainlineName_73", + "text": "1-44" + }, + "title": { + "key": "mainchapter_main_stage_title_73", + "text": "测试34" + }, + "desc": { + "key": "mainchapter_main_stage_desc_73", + "text": "测试34" + }, + "exp": 0, + "hero_exp": 0, + "ps_consume": [], + "ps_mg": [], + "firstaward": [ + { + "a": "attr", + "t": "gold", + "n": 1000000 + } + ], + "lotteryward": 0, + "commonaward": [ + { + "a": "attr", + "t": "gold", + "n": 100 + } + ], + "BattleReadyID": 0, + "FormatList": [], + "star": [], + "star_type": [], + "star_value": [], + "challengeward": 0 + }, { "id": 1100201, "chapterid": 11002, diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 2ed7dee7e..2d98e55dc 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -20563,7 +20563,7 @@ "From": 4, "Where": [], "Order": "", - "Limit": 1, + "Limit": 2, "ExecuteCnt": 1, "Type": 1, "Argu": [ @@ -20571,10 +20571,10 @@ 4, 4000 ], - "FollowSK": [], - "SucFollowSK": [ + "FollowSK": [ 243001313 ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -20597,9 +20597,7 @@ 4000 ], "FollowSK": [], - "SucFollowSK": [ - 243001313 - ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 0a5ecc196..3362a5dff 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -15482,8 +15482,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 243001311, - 243001312 + 243001311 ] }, "Desc": { @@ -15514,8 +15513,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 243001321, - 243001312 + 243001321 ] }, "Desc": { @@ -15546,8 +15544,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 243001331, - 243001312 + 243001331 ] }, "Desc": { @@ -15578,8 +15575,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 243001341, - 243001312 + 243001341 ] }, "Desc": { @@ -15610,8 +15606,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 243001351, - 243001312 + 243001351 ] }, "Desc": { diff --git a/bin/json/game_worldall.json b/bin/json/game_worldall.json index d2fbf5276..9a5d4e400 100644 --- a/bin/json/game_worldall.json +++ b/bin/json/game_worldall.json @@ -107,58 +107,6 @@ }, "reword": [] }, - { - "id": 302, - "name": { - "key": "worldtask_world_all_name_7", - "text": "支线测试A" - }, - "task_icon": "", - "task_txt": { - "key": "", - "text": "" - }, - "reword": [] - }, - { - "id": 303, - "name": { - "key": "worldtask_world_all_name_8", - "text": "支线测试B" - }, - "task_icon": "", - "task_txt": { - "key": "", - "text": "" - }, - "reword": [] - }, - { - "id": 304, - "name": { - "key": "worldtask_world_all_name_9", - "text": "支线测试C" - }, - "task_icon": "", - "task_txt": { - "key": "", - "text": "" - }, - "reword": [] - }, - { - "id": 305, - "name": { - "key": "worldtask_world_all_name_10", - "text": "支线测试D" - }, - "task_icon": "", - "task_txt": { - "key": "", - "text": "" - }, - "reword": [] - }, { "id": 1010, "name": { diff --git a/bin/json/game_worldbattle.json b/bin/json/game_worldbattle.json index 15eb592be..68246772d 100644 --- a/bin/json/game_worldbattle.json +++ b/bin/json/game_worldbattle.json @@ -18,7 +18,7 @@ "FormatList": [ 700012 ], - "BattleReadyID": 126, + "BattleReadyID": 127, "EventList": [], "playexp": { "a": "attr", diff --git a/bin/json/game_worldrd.json b/bin/json/game_worldrd.json index 84338be6b..602d8ed9c 100644 --- a/bin/json/game_worldrd.json +++ b/bin/json/game_worldrd.json @@ -6,7 +6,7 @@ "key": "eventname_1", "text": "无事发生" }, - "eventweight": 1000, + "eventweight": 40000, "eventtype": 0, "battleready": 0, "battleid": 0, @@ -19,10 +19,10 @@ "key": "eventname_2", "text": "打怪" }, - "eventweight": 1000, + "eventweight": 30000, "eventtype": 1, "battleready": 126, - "battleid": 720001, + "battleid": 101011, "getitem": [] }, { @@ -30,26 +30,38 @@ "group": 1001, "eventname": { "key": "eventname_3", - "text": "打怪" + "text": "获取金币" }, - "eventweight": 1000, - "eventtype": 1, - "battleready": 126, - "battleid": 720001, - "getitem": [] + "eventweight": 10000, + "eventtype": 2, + "battleready": 0, + "battleid": 0, + "getitem": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + } + ] }, { "id": 4, "group": 1001, "eventname": { "key": "eventname_4", - "text": "打怪" + "text": "获取金币" }, - "eventweight": 1000, - "eventtype": 1, - "battleready": 126, - "battleid": 720001, - "getitem": [] + "eventweight": 10000, + "eventtype": 0, + "battleready": 0, + "battleid": 0, + "getitem": [ + { + "a": "attr", + "t": "gold", + "n": 38000 + } + ] }, { "id": 5, @@ -58,6 +70,77 @@ "key": "eventname_5", "text": "获取金币" }, + "eventweight": 10000, + "eventtype": 0, + "battleready": 0, + "battleid": 0, + "getitem": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 6, + "group": 1002, + "eventname": { + "key": "eventname_6", + "text": "无事发生" + }, + "eventweight": 1000, + "eventtype": 0, + "battleready": 0, + "battleid": 0, + "getitem": [] + }, + { + "id": 7, + "group": 1002, + "eventname": { + "key": "eventname_7", + "text": "打怪" + }, + "eventweight": 1000, + "eventtype": 1, + "battleready": 126, + "battleid": 101011, + "getitem": [] + }, + { + "id": 8, + "group": 1002, + "eventname": { + "key": "eventname_8", + "text": "打怪" + }, + "eventweight": 1000, + "eventtype": 1, + "battleready": 126, + "battleid": 101011, + "getitem": [] + }, + { + "id": 9, + "group": 1002, + "eventname": { + "key": "eventname_9", + "text": "打怪" + }, + "eventweight": 1000, + "eventtype": 1, + "battleready": 126, + "battleid": 101011, + "getitem": [] + }, + { + "id": 10, + "group": 1002, + "eventname": { + "key": "eventname_10", + "text": "获取金币" + }, "eventweight": 1000, "eventtype": 2, "battleready": 0, @@ -70,77 +153,6 @@ } ] }, - { - "id": 6, - "group": 1001, - "eventname": { - "key": "eventname_6", - "text": "获取金币" - }, - "eventweight": 1000, - "eventtype": 2, - "battleready": 0, - "battleid": 0, - "getitem": [ - { - "a": "attr", - "t": "gold", - "n": 20000 - } - ] - }, - { - "id": 7, - "group": 1002, - "eventname": { - "key": "eventname_7", - "text": "无事发生" - }, - "eventweight": 1000, - "eventtype": 0, - "battleready": 0, - "battleid": 0, - "getitem": [] - }, - { - "id": 8, - "group": 1002, - "eventname": { - "key": "eventname_8", - "text": "打怪" - }, - "eventweight": 1000, - "eventtype": 1, - "battleready": 126, - "battleid": 720001, - "getitem": [] - }, - { - "id": 9, - "group": 1002, - "eventname": { - "key": "eventname_9", - "text": "打怪" - }, - "eventweight": 1000, - "eventtype": 1, - "battleready": 126, - "battleid": 720001, - "getitem": [] - }, - { - "id": 10, - "group": 1002, - "eventname": { - "key": "eventname_10", - "text": "打怪" - }, - "eventweight": 1000, - "eventtype": 1, - "battleready": 126, - "battleid": 720001, - "getitem": [] - }, { "id": 11, "group": 1002, @@ -152,25 +164,6 @@ "eventtype": 2, "battleready": 0, "battleid": 0, - "getitem": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - } - ] - }, - { - "id": 12, - "group": 1002, - "eventname": { - "key": "eventname_12", - "text": "获取金币" - }, - "eventweight": 1000, - "eventtype": 2, - "battleready": 0, - "battleid": 0, "getitem": [ { "a": "attr", diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 034afab8a..f9de1796a 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -117,11 +117,6 @@ "a": "attr", "t": "gold", "n": 8200 - }, - { - "a": "hero", - "t": "44004", - "n": 1 } ], "module": [] @@ -5579,9 +5574,9 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20220, + "ontxe": 300020, "id_after": 300040, - "group": 302, + "group": 301, "exgroup": 310, "des": 3, "icon": "25001", @@ -5623,7 +5618,7 @@ "lockend": 999, "ontxe": 300030, "id_after": 300050, - "group": 302, + "group": 301, "exgroup": 310, "des": 3, "icon": "25001", @@ -5665,7 +5660,7 @@ "lockend": 999, "ontxe": 300040, "id_after": 300060, - "group": 302, + "group": 301, "exgroup": 310, "des": 3, "icon": "25001", @@ -5707,7 +5702,7 @@ "lockend": 999, "ontxe": 300050, "id_after": 300061, - "group": 302, + "group": 301, "exgroup": 310, "des": 3, "icon": "25001", @@ -5747,7 +5742,7 @@ "lockend": 999, "ontxe": 300060, "id_after": 300062, - "group": 303, + "group": 301, "exgroup": 310, "des": 3, "icon": "25001", @@ -5787,7 +5782,7 @@ "lockend": 999, "ontxe": 300061, "id_after": 0, - "group": 303, + "group": 301, "exgroup": 310, "des": 3, "icon": "25001", @@ -5825,9 +5820,9 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 300060, + "ontxe": 300062, "id_after": 0, - "group": 304, + "group": 301, "exgroup": 310, "des": 3, "icon": "25001", @@ -5867,7 +5862,7 @@ "lockend": 999, "ontxe": 300070, "id_after": 0, - "group": 305, + "group": 301, "exgroup": 310, "des": 3, "icon": "25001", @@ -5937,7 +5932,17 @@ { "a": "attr", "t": "gold", - "n": 500 + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 } ], "module": [] @@ -5979,7 +5984,17 @@ { "a": "attr", "t": "gold", - "n": 501 + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 } ], "module": [] @@ -5990,8 +6005,8 @@ "lock": 1, "lockend": 999, "ontxe": 0, - "id_after": 100040, - "group": 1030, + "id_after": 0, + "group": 1020, "exgroup": 110, "des": 1, "icon": "25001", @@ -6021,7 +6036,17 @@ { "a": "attr", "t": "gold", - "n": 502 + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 } ], "module": [] @@ -6031,7 +6056,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 100030, + "ontxe": 0, "id_after": 0, "group": 1030, "exgroup": 110, @@ -6063,7 +6088,17 @@ { "a": "attr", "t": "gold", - "n": 503 + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 } ], "module": [] @@ -6074,8 +6109,8 @@ "lock": 1, "lockend": 999, "ontxe": 0, - "id_after": 100060, - "group": 1050, + "id_after": 0, + "group": 1040, "exgroup": 110, "des": 1, "icon": "25001", @@ -6105,7 +6140,17 @@ { "a": "attr", "t": "gold", - "n": 504 + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 } ], "module": [] @@ -6115,8 +6160,8 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 100050, - "id_after": 100070, + "ontxe": 0, + "id_after": 0, "group": 1050, "exgroup": 110, "des": 1, @@ -6147,7 +6192,17 @@ { "a": "attr", "t": "gold", - "n": 505 + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 } ], "module": [] @@ -6157,9 +6212,9 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 100060, + "ontxe": 0, "id_after": 0, - "group": 1050, + "group": 1060, "exgroup": 110, "des": 1, "icon": "25001", @@ -6189,7 +6244,17 @@ { "a": "attr", "t": "gold", - "n": 506 + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 } ], "module": [] @@ -6231,7 +6296,17 @@ { "a": "attr", "t": "gold", - "n": 507 + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 } ], "module": [] @@ -6273,7 +6348,17 @@ { "a": "attr", "t": "gold", - "n": 508 + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 } ], "module": [] @@ -6315,7 +6400,17 @@ { "a": "attr", "t": "gold", - "n": 509 + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 } ], "module": [] @@ -6357,7 +6452,17 @@ { "a": "attr", "t": "gold", - "n": 510 + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 } ], "module": [] @@ -6399,7 +6504,17 @@ { "a": "attr", "t": "gold", - "n": 511 + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 } ], "module": [] @@ -6441,7 +6556,17 @@ { "a": "attr", "t": "gold", - "n": 512 + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 } ], "module": [] @@ -6483,7 +6608,17 @@ { "a": "attr", "t": "gold", - "n": 513 + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 } ], "module": [] @@ -6525,7 +6660,17 @@ { "a": "attr", "t": "gold", - "n": 514 + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 } ], "module": [] @@ -6567,7 +6712,17 @@ { "a": "attr", "t": "gold", - "n": 515 + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 } ], "module": [] @@ -6609,7 +6764,17 @@ { "a": "attr", "t": "gold", - "n": 516 + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 } ], "module": [] @@ -6651,7 +6816,17 @@ { "a": "attr", "t": "gold", - "n": 517 + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 } ], "module": [] @@ -6693,7 +6868,17 @@ { "a": "attr", "t": "gold", - "n": 518 + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 } ], "module": [] @@ -6735,7 +6920,17 @@ { "a": "attr", "t": "gold", - "n": 519 + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 } ], "module": [] @@ -6777,7 +6972,17 @@ { "a": "attr", "t": "gold", - "n": 520 + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 } ], "module": [] @@ -6819,7 +7024,17 @@ { "a": "attr", "t": "gold", - "n": 521 + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 } ], "module": [] @@ -6861,7 +7076,17 @@ { "a": "attr", "t": "gold", - "n": 522 + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 } ], "module": [] @@ -6903,7 +7128,17 @@ { "a": "attr", "t": "gold", - "n": 523 + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 } ], "module": [] @@ -6945,7 +7180,17 @@ { "a": "attr", "t": "gold", - "n": 524 + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 } ], "module": [] @@ -6987,7 +7232,17 @@ { "a": "attr", "t": "gold", - "n": 525 + "n": 5000 + }, + { + "a": "attr", + "t": "ps", + "n": 10 + }, + { + "a": "attr", + "t": "diamond", + "n": 10 } ], "module": [] diff --git a/comm/const.go b/comm/const.go index 459119794..96352f3af 100644 --- a/comm/const.go +++ b/comm/const.go @@ -521,8 +521,10 @@ const ( Reddot10 ReddotType = 10010 //英雄----共鸣红点 前端处理 Reddot20301 ReddotType = 20301 //英雄----升星红点 前端处理 //公会 - Reddot15102 ReddotType = 15102 //公会----签到红点 + Reddot15102 ReddotType = 15102 //公会----签到红点 今日剩余签到 Reddot15201 ReddotType = 15201 //公会----申请红点 + Reddot15301 ReddotType = 15301 //公会----公会副本 今日剩余挑战次数：x + Reddot15401 ReddotType = 15401 //公会----公会任务 今日剩余任务：x //主线关卡 //Reddot11100 ReddotType = 11100 //主线关卡----可挑战红点 -- 废弃 // 铁匠铺 @@ -533,6 +535,7 @@ const ( //竞技场 Reddot22100 ReddotType = 22100 //当玩家竞技场可挑战次数到达最大时 Reddot22102 ReddotType = 22102 //当竞技场npc可以挑战时 + Reddot22202 ReddotType = 22202 //今日剩余挑战券：x Reddot6 ReddotType = 10006 //爬塔----可挑战红点 Reddot7 ReddotType = 10007 //爬塔----奖励红点 @@ -542,7 +545,8 @@ const ( Reddot20 ReddotType = 10020 //丛林美食馆----可挂机红点 Reddot21 ReddotType = 10021 //丛林美食馆----可升级红点 Reddot22 ReddotType = 10022 //丛林美食馆----可领取奖励红 - Reddot23 ReddotType = 10023 //熊猫武馆----可挂机红点 + // 武馆 + Reddot23 ReddotType = 10023 //熊猫武馆----可挂机红点 今日剩余训练次数：x Reddot24 ReddotType = 10024 //熊猫武馆----可升级红点 Reddot25 ReddotType = 10025 //熊猫武馆----可领取奖励红点 Reddot33 ReddotType = 10033 //附魔副本 有挑战次数 @@ -560,6 +564,17 @@ const ( //23101 烹饪 Reddot23101 ReddotType = 23101 // 烹饪奖励菜谱图鉴图标 + + //每日任务 + Reddot25101 ReddotType = 25101 // 每日任务进度红点 + //武馆 + Reddot26101 ReddotType = 26101 // 每日一练 + //云朵签到 + Reddot27101 ReddotType = 27101 // 签到进度 + //巨怪商队跑商 + Reddot28101 ReddotType = 28101 // 剩余车票 + //种族塔 + Reddot29101 ReddotType = 29101 // 今日剩余可挑战关卡：x ) type TaskType int32 diff --git a/comm/imodule.go b/comm/imodule.go index 8950838ab..5f4fab64b 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -463,8 +463,6 @@ type ( IPay interface { //模拟发货 ModulePayDelivery(session IUserSession, Productid string, Price int32) (errdata *pb.ErrorData) - //开启活动 - OpenActivity(atype int32, opentime int64) IActivityNotice } //支付发货 @@ -589,7 +587,6 @@ type ( //战令 IWarorder interface { Delivery(session IUserSession, pid string) (errdata *pb.ErrorData, items []*pb.UserAssets) - OpenWarorder(wtype int32, opentime int64) IActivityNotice } @@ -601,6 +598,7 @@ type ( } //每日任务 IDailytask interface { + IGetReddot //任务组完成 TaskGroupComplete(session IUserSession, group int32) } @@ -611,4 +609,9 @@ type ( // bingo 关卡 BingoJumpLevel(session IUserSession, level int32) (errdata *pb.ErrorData) } + //工会boos战 + IGuildgve interface { + ///红点 + IGetReddot + } ) diff --git a/modules/arena/modelarena.go b/modules/arena/modelarena.go index b9cc1f04c..143315413 100644 --- a/modules/arena/modelarena.go +++ b/modules/arena/modelarena.go @@ -446,29 +446,34 @@ func (this *modelArena) recoverTicket(session comm.IUserSession, info *pb.DBAren } } -func (this *modelArena) reddot(session comm.IUserSession) bool { +func (this *modelArena) reddot(session comm.IUserSession) (info *pb.DBArenaUser, ticket int32, activated bool) { var ( - info *pb.DBArenaUser ticketitem *cfg.Gameatn err error ) if info, err = this.queryPlayerInfo(session.GetUserId()); err != nil && err != mgo.MongodbNil { - return false + activated = false + info = nil + return } if err == mgo.MongodbNil { global := this.module.ModuleTools.GetGlobalConf() if global.ArenaTicketMax >= global.ArenaTicketCos.N { - return true + ticket = global.ArenaTicketMax + activated = true + return } - return false + activated = false } if ticketitem = this.module.ModuleTools.GetGlobalConf().ArenaTicketCos; ticketitem == nil { this.module.Error("竞技场配置未找到!", log.Field{Key: "key", Value: "ArenaTicketCos"}) - return false + activated = false + return } - ticket := int32(this.module.ModuleItems.QueryItemAmount(info.Uid, ticketitem.T)) + ticket = int32(this.module.ModuleItems.QueryItemAmount(info.Uid, ticketitem.T)) if ticket > this.module.ModuleTools.GetGlobalConf().ArenaTicketCos.N { - return true + activated = true + return } - return false + return } diff --git a/modules/arena/module.go b/modules/arena/module.go index a0d46e193..1d9a1cb2b 100644 --- a/modules/arena/module.go +++ b/modules/arena/module.go @@ -39,12 +39,12 @@ type Arena struct { modelRank *modelRank } -//模块名 +// 模块名 func (this *Arena) GetType() core.M_Modules { return comm.ModuleArena } -//模块初始化接口 注册用户创建角色事件 +// 模块初始化接口 注册用户创建角色事件 func (this *Arena) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { err = this.ModuleBase.Init(service, module, options) this.service = service.(base.IRPCXService) @@ -70,7 +70,7 @@ func (this *Arena) Start() (err error) { return } -//装备组件 +// 装备组件 func (this *Arena) OnInstallComp() { this.ModuleBase.OnInstallComp() this.api = this.RegisterComp(new(apiComp)).(*apiComp) @@ -79,7 +79,7 @@ func (this *Arena) OnInstallComp() { this.modelRank = this.RegisterComp(new(modelRank)).(*modelRank) } -//比赛结算 +// 比赛结算 func (this *Arena) Rpc_ModuleArenaRaceSettlement(ctx context.Context, args *pb.EmptyReq, reply *pb.EmptyResp) (err error) { this.Debug("Rpc_ModuleArenaRaceSettlement", log.Field{Key: "args", Value: args.String()}, @@ -88,23 +88,47 @@ func (this *Arena) Rpc_ModuleArenaRaceSettlement(ctx context.Context, args *pb.E return } -//修改用户积分 +// 修改用户积分 func (this *Arena) Rpc_ModuleArenaModifyIntegral(ctx context.Context, args *pb.RPCModifyIntegralReq, reply *pb.EmptyResp) (err error) { this.Debug("Rpc_ModuleArenaModifyIntegral", log.Field{Key: "args", Value: args.String()}) err = this.modelArena.modifyIntegral(args.Uid, args.Integral) return } -//红点需求 +// 红点需求 func (this *Arena) Reddot(session comm.IUserSession, rid ...comm.ReddotType) (result map[comm.ReddotType]*pb.ReddotItem) { + var ( + info *pb.DBArenaUser = &pb.DBArenaUser{} + activated bool + ticket int32 + ) + if info, ticket, activated = this.modelArena.reddot(session); info == nil { + return + } result = make(map[comm.ReddotType]*pb.ReddotItem) for _, v := range rid { switch v { + case comm.Reddot22100: + result[comm.Reddot22102] = &pb.ReddotItem{ + Rid: int32(comm.Reddot22102), + } + if ticket == this.ModuleTools.GetGlobalConf().ArenaTicketCos.N { + result[comm.Reddot22102].Activated = true + } + break case comm.Reddot22102: result[comm.Reddot22102] = &pb.ReddotItem{ Rid: int32(comm.Reddot22102), } - result[comm.Reddot22102].Activated = this.modelArena.reddot(session) + result[comm.Reddot22102].Activated = activated + break + + case comm.Reddot22202: + result[comm.Reddot22102] = &pb.ReddotItem{ + Rid: int32(comm.Reddot22102), + Activated: true, + Progress: ticket, + } break } } @@ -128,7 +152,7 @@ func (this *Arena) SetUserIntegral(session comm.IUserSession, Integral int32) (e return } -///获取竞技场匹配目标战斗阵型数据 +// /获取竞技场匹配目标战斗阵型数据 func (this *Arena) GetMatcheBattleRoles(uid string) (captain int32, rules []*pb.BattleRole, err error) { var ( global *cfg.GameGlobalData diff --git a/modules/dailytask/module.go b/modules/dailytask/module.go index d6007dafe..aa8163421 100644 --- a/modules/dailytask/module.go +++ b/modules/dailytask/module.go @@ -132,3 +132,35 @@ func (this *Dailytask) TaskGroupComplete(session comm.IUserSession, group int32) } } } + +// 查询每日红点信息 +func (this *Dailytask) Reddot(session comm.IUserSession, rid ...comm.ReddotType) (reddot map[comm.ReddotType]*pb.ReddotItem) { + var ( + dtask *pb.DBDailytask + progress int32 + err error + ) + reddot = make(map[comm.ReddotType]*pb.ReddotItem) + if dtask, err = this.modelDailytask.getUserDTasks(session.GetUserId()); err != nil { + this.Errorln(err) + return + } + for _, v := range rid { + switch v { + case comm.Reddot25101: + for _, v := range dtask.Groups { + if !v.Complete { + progress++ + } + } + reddot[comm.Reddot25101] = &pb.ReddotItem{ + Rid: int32(comm.Reddot25101), + Activated: true, + Progress: progress, + Total: int32(len(dtask.Groups)), + } + break + } + } + return +} diff --git a/modules/guildgve/modelGuildMember.go b/modules/guildgve/modelGuildMember.go index 3d43b5b31..f87a847a8 100644 --- a/modules/guildgve/modelGuildMember.go +++ b/modules/guildgve/modelGuildMember.go @@ -66,12 +66,21 @@ func (this *ModelGuildMember) getGuildMember(guild, uid string) (results *pb.DBG } err = this.Add(uid, results) } - if results.Guild != guild { + if guild != "" && results.Guild != guild { results.Guild = guild } return } +// 查询红会成员 +func (this *ModelGuildMember) inquireGuildMember(uid string) (results *pb.DBGuildMember, err error) { + results = &pb.DBGuildMember{} + if err = this.Get(uid, results); err != nil { + return + } + return +} + func (this *ModelGuildMember) updateGuildMember(data *pb.DBGuildMember) (err error) { if err = this.Change(data.Uid, map[string]interface{}{ "guild": data.Guild, diff --git a/modules/guildgve/module.go b/modules/guildgve/module.go index e52d79b1f..4072c1a38 100644 --- a/modules/guildgve/module.go +++ b/modules/guildgve/module.go @@ -76,3 +76,27 @@ func (this *GuildGve) Rpc_ModuleGuildBossSettlement(ctx context.Context, req *pb this.modelRank.raceSettlement() return } + +// 红点 +func (this *GuildGve) Reddot(session comm.IUserSession, rid ...comm.ReddotType) (reddot map[comm.ReddotType]*pb.ReddotItem) { + var ( + member *pb.DBGuildMember + err error + ) + reddot = make(map[comm.ReddotType]*pb.ReddotItem) + if member, err = this.modelGuildMember.inquireGuildMember(session.GetUserId()); err != nil { + return + } + for _, v := range rid { + switch v { + case comm.Reddot15301: + reddot[comm.Reddot26101] = &pb.ReddotItem{ + Rid: int32(comm.Reddot26101), + Activated: true, + Progress: member.Boosticket, + } + break + } + } + return +} diff --git a/modules/practice/module.go b/modules/practice/module.go index 27b4c0419..83d27086f 100644 --- a/modules/practice/module.go +++ b/modules/practice/module.go @@ -407,3 +407,29 @@ func (this *Practice) CleanUpNpc(uid string) { func (this *Practice) GetAllJxRes() (res []string, err error) { return this.configure.getAllGamePandamasJx() } + +// 红点 +func (this *Practice) Reddot(session comm.IUserSession, rid ...comm.ReddotType) (reddot map[comm.ReddotType]*pb.ReddotItem) { + var ( + room *pb.DBPracticeRoom + err error + ) + reddot = make(map[comm.ReddotType]*pb.ReddotItem) + if room, err = this.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil { + this.Errorln(err) + return + } + for _, v := range rid { + switch v { + case comm.Reddot26101: + reddot[comm.Reddot26101] = &pb.ReddotItem{ + Rid: int32(comm.Reddot26101), + Activated: true, + Progress: room.Gymrefresh, + Total: 1, + } + break + } + } + return +} diff --git a/modules/reddot/api_get.go b/modules/reddot/api_get.go index f13fe68d7..e10f724f6 100644 --- a/modules/reddot/api_get.go +++ b/modules/reddot/api_get.go @@ -5,13 +5,13 @@ import ( "go_dreamfactory/pb" ) -//参数校验 +// 参数校验 func (this *apiComp) GetCheck(session comm.IUserSession, req *pb.ReddotGetReq) (errdata *pb.ErrorData) { return } -///获取系统公告 +// /获取系统公告 func (this *apiComp) Get(session comm.IUserSession, req *pb.ReddotGetReq) (errdata *pb.ErrorData) { var ( reddot map[int32]*pb.ReddotItem = make(map[int32]*pb.ReddotItem) @@ -38,7 +38,7 @@ func (this *apiComp) Get(session comm.IUserSession, req *pb.ReddotGetReq) (errda reddot[int32(k)] = v } //工会 - case comm.Reddot15102, comm.Reddot15201: + case comm.Reddot15102, comm.Reddot15201, comm.Reddot15401: for k, v := range this.module.ModuleSociaty.Reddot(session, _rid) { reddot[int32(k)] = v } @@ -57,6 +57,16 @@ func (this *apiComp) Get(session comm.IUserSession, req *pb.ReddotGetReq) (errda for k, v := range this.module.library.Reddot(session, _rid) { reddot[int32(k)] = v } + //每日任务 + case comm.Reddot25101: + for k, v := range this.module.library.Reddot(session, _rid) { + reddot[int32(k)] = v + } + //工会boos战 + case comm.Reddot15301: + for k, v := range this.module.guildgve.Reddot(session, _rid) { + reddot[int32(k)] = v + } case comm.Reddot17: for k, v := range this.module.horoscope.Reddot(session, _rid) { reddot[int32(k)] = v diff --git a/modules/reddot/module.go b/modules/reddot/module.go index 86c0a73c7..5f8755f26 100644 --- a/modules/reddot/module.go +++ b/modules/reddot/module.go @@ -28,22 +28,24 @@ type Reddot struct { sociaty comm.ISociaty //工会 pagoda comm.IPagoda horoscope comm.IHoroscope - arena comm.IArena //竞技场 + arena comm.IArena //竞技场 + dailytask comm.IDailytask //每日任务 friend comm.IFriend gourmet comm.IGourmet viking comm.IViking hunting comm.IHunting + guildgve comm.IGuildgve //工会boos战 api_comp *apiComp mline comm.IMline } -//模块名 +// 模块名 func (this *Reddot) GetType() core.M_Modules { return comm.ModuleReddot } -//模块初始化接口 注册用户创建角色事件 +// 模块初始化接口 注册用户创建角色事件 func (this *Reddot) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { err = this.ModuleBase.Init(service, module, options) this.service = service.(base.IRPCXService) @@ -107,16 +109,24 @@ func (this *Reddot) Start() (err error) { } this.library = module.(comm.ILibrary) + if module, err = this.service.GetModule(comm.ModuleDailytask); err != nil { + return + } + this.dailytask = module.(comm.IDailytask) + if module, err = this.service.GetModule(comm.ModuleGuildGve); err != nil { + return + } + this.guildgve = module.(comm.IGuildgve) return } -//装备组件 +// 装备组件 func (this *Reddot) OnInstallComp() { this.ModuleBase.OnInstallComp() this.api_comp = this.RegisterComp(new(apiComp)).(*apiComp) } -//推送红点 +// 推送红点 func (this *Reddot) PushReddot(session comm.IUserSession, reddot ...*pb.ReddotItem) (errdata *pb.ErrorData) { if len(reddot) <= 0 { return diff --git a/modules/sociaty/module.go b/modules/sociaty/module.go index 4c9f827bf..634caeefb 100644 --- a/modules/sociaty/module.go +++ b/modules/sociaty/module.go @@ -178,40 +178,39 @@ func (this *Sociaty) Reddot(session comm.IUserSession, rid ...comm.ReddotType) ( reddot = make(map[comm.ReddotType]*pb.ReddotItem) sociaty := this.modelSociaty.getUserSociaty(session.GetUserId()) if sociaty == nil || sociaty.Id == "" { - for _, v := range rid { - reddot[v] = &pb.ReddotItem{ - Rid: int32(v), - Activated: false, - Nextchanagetime: 0, - } - } - } else { - var applyReddot bool - if this.modelSociaty.isRight(session.GetUserId(), sociaty, - pb.SociatyJob_PRESIDENT, - pb.SociatyJob_VICEPRESIDENT, - pb.SociatyJob_ADMIN) { + return + } + var applyReddot bool + if this.modelSociaty.isRight(session.GetUserId(), sociaty, + pb.SociatyJob_PRESIDENT, + pb.SociatyJob_VICEPRESIDENT, + pb.SociatyJob_ADMIN) { - if len(sociaty.ApplyRecord) > 0 { - applyReddot = true - } + if len(sociaty.ApplyRecord) > 0 { + applyReddot = true } - for _, v := range rid { - switch v { - case comm.Reddot15102: - tf := this.modelSociaty.IsSign(session.GetUserId(), sociaty) - reddot[comm.Reddot15102] = - &pb.ReddotItem{ - Rid: int32(comm.Reddot15102), - Activated: !tf, - Nextchanagetime: 0, - } - case comm.Reddot15201: - reddot[comm.Reddot15201] = &pb.ReddotItem{ - Rid: int32(comm.Reddot15201), - Activated: applyReddot, + } + for _, v := range rid { + switch v { + case comm.Reddot15102: + progress := int32(0) + tf := this.modelSociaty.IsSign(session.GetUserId(), sociaty) + if tf { + progress = 1 + } + reddot[comm.Reddot15102] = + &pb.ReddotItem{ + Rid: int32(comm.Reddot15102), + Activated: !tf, Nextchanagetime: 0, + Progress: progress, + Total: 1, } + case comm.Reddot15201: + reddot[comm.Reddot15201] = &pb.ReddotItem{ + Rid: int32(comm.Reddot15201), + Activated: applyReddot, + Nextchanagetime: 0, } } } diff --git a/pb/reddot_msg.pb.go b/pb/reddot_msg.pb.go index 69b4af976..771a50ae2 100644 --- a/pb/reddot_msg.pb.go +++ b/pb/reddot_msg.pb.go @@ -28,6 +28,8 @@ type ReddotItem struct { Rid int32 `protobuf:"varint,1,opt,name=rid,proto3" json:"rid"` //红点id Activated bool `protobuf:"varint,2,opt,name=activated,proto3" json:"activated"` //是否激活 Nextchanagetime int64 `protobuf:"varint,3,opt,name=nextchanagetime,proto3" json:"nextchanagetime"` //下次变化时间 为0 不处理 + Progress int32 `protobuf:"varint,4,opt,name=progress,proto3" json:"progress"` //进度 + Total int32 `protobuf:"varint,5,opt,name=total,proto3" json:"total"` //总值 } func (x *ReddotItem) Reset() { @@ -83,6 +85,20 @@ func (x *ReddotItem) GetNextchanagetime() int64 { return 0 } +func (x *ReddotItem) GetProgress() int32 { + if x != nil { + return x.Progress + } + return 0 +} + +func (x *ReddotItem) GetTotal() int32 { + if x != nil { + return x.Total + } + return 0 +} + //红点信息请求 type ReddotGetAllReq struct { state protoimpl.MessageState @@ -316,39 +332,43 @@ var File_reddot_reddot_msg_proto protoreflect.FileDescriptor var file_reddot_reddot_msg_proto_rawDesc = []byte{ 0x0a, 0x17, 0x72, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x2f, 0x72, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x5f, - 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x66, 0x0a, 0x0a, 0x52, 0x65, 0x64, - 0x64, 0x6f, 0x74, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x63, 0x74, - 0x69, 0x76, 0x61, 0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x61, 0x63, - 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x64, 0x12, 0x28, 0x0a, 0x0f, 0x6e, 0x65, 0x78, 0x74, 0x63, - 0x68, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x0f, 0x6e, 0x65, 0x78, 0x74, 0x63, 0x68, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x74, 0x69, 0x6d, - 0x65, 0x22, 0x11, 0x0a, 0x0f, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x47, 0x65, 0x74, 0x41, 0x6c, - 0x6c, 0x52, 0x65, 0x71, 0x22, 0x91, 0x01, 0x0a, 0x10, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x47, - 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x35, 0x0a, 0x06, 0x72, 0x65, 0x64, - 0x64, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x52, 0x65, 0x64, 0x64, - 0x6f, 0x74, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x52, 0x65, 0x64, - 0x64, 0x6f, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x65, 0x64, 0x64, 0x6f, 0x74, - 0x1a, 0x46, 0x0a, 0x0b, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, - 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, - 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x0b, 0x2e, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x22, 0x0a, 0x0c, 0x52, 0x65, 0x64, 0x64, - 0x6f, 0x74, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x69, 0x64, 0x73, - 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x04, 0x72, 0x69, 0x64, 0x73, 0x22, 0x8b, 0x01, 0x0a, - 0x0d, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x47, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x32, - 0x0a, 0x06, 0x72, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, - 0x2e, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x47, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x52, - 0x65, 0x64, 0x64, 0x6f, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x65, 0x64, 0x64, - 0x6f, 0x74, 0x1a, 0x46, 0x0a, 0x0b, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, - 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x49, 0x74, 0x65, 0x6d, 0x52, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x33, 0x0a, 0x10, 0x52, 0x65, - 0x64, 0x64, 0x6f, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1f, - 0x0a, 0x04, 0x72, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x52, - 0x65, 0x64, 0x64, 0x6f, 0x74, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x04, 0x72, 0x69, 0x64, 0x73, 0x42, - 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x98, 0x01, 0x0a, 0x0a, 0x52, 0x65, + 0x64, 0x64, 0x6f, 0x74, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x63, + 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x61, + 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x64, 0x12, 0x28, 0x0a, 0x0f, 0x6e, 0x65, 0x78, 0x74, + 0x63, 0x68, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x0f, 0x6e, 0x65, 0x78, 0x74, 0x63, 0x68, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x74, 0x69, + 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x12, 0x14, + 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74, + 0x6f, 0x74, 0x61, 0x6c, 0x22, 0x11, 0x0a, 0x0f, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x47, 0x65, + 0x74, 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x71, 0x22, 0x91, 0x01, 0x0a, 0x10, 0x52, 0x65, 0x64, 0x64, + 0x6f, 0x74, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x35, 0x0a, 0x06, + 0x72, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x52, + 0x65, 0x64, 0x64, 0x6f, 0x74, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x2e, + 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x65, 0x64, + 0x64, 0x6f, 0x74, 0x1a, 0x46, 0x0a, 0x0b, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x49, 0x74, 0x65, 0x6d, + 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x22, 0x0a, 0x0c, 0x52, + 0x65, 0x64, 0x64, 0x6f, 0x74, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x72, + 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x04, 0x72, 0x69, 0x64, 0x73, 0x22, + 0x8b, 0x01, 0x0a, 0x0d, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x47, 0x65, 0x74, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x32, 0x0a, 0x06, 0x72, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x1a, 0x2e, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x47, 0x65, 0x74, 0x52, 0x65, 0x73, + 0x70, 0x2e, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, + 0x65, 0x64, 0x64, 0x6f, 0x74, 0x1a, 0x46, 0x0a, 0x0b, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x49, 0x74, + 0x65, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x33, 0x0a, + 0x10, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, + 0x68, 0x12, 0x1f, 0x0a, 0x04, 0x72, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x0b, 0x2e, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x04, 0x72, 0x69, + 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var (