liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
meixiongfeng 2023-08-01 13:45:15 +08:00
commit 58dad82fe0
21 changed files with 853 additions and 442 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
bin/json/game_gamesummary.json
View File

@ -3,7 +3,7 @@
"id": 1, "id": 1,
"name": { "name": {
"key": "gamesummary_node_name_1", "key": "gamesummary_node_name_1",
"text": "冒险关卡" "text": "冒险故事"
}, },
"tabId": 2, "tabId": 2,
"mapPos": { "mapPos": {
@ -15,7 +15,7 @@
"jumpId": 166, "jumpId": 166,
"introduce": { "introduce": {
"key": "gamesummary_node_introdunce_1", "key": "gamesummary_node_introdunce_1",
"text": "冒险关卡" "text": "故事的开始起于一场冒险，但后来这个故事里不但有冒险，还有友谊和爱。"
}, },
"bg": "hkz_wftj_zxgk", "bg": "hkz_wftj_zxgk",
"icon": "Attack", "icon": "Attack",
@ -48,7 +48,7 @@
"jumpId": 10015, "jumpId": 10015,
"introduce": { "introduce": {
"key": "gamesummary_node_introdunce_2", "key": "gamesummary_node_introdunce_2",
"text": "竞技场" "text": "一流剑客靴猫喜欢比武，他在此建立了一个竞技场，看看城中谁才是最强。"
}, },
"bg": "hkz_wftj_jjc", "bg": "hkz_wftj_jjc",
"icon": "rw_cj_icon09", "icon": "rw_cj_icon09",
@ -76,7 +76,7 @@
"jumpId": 10023, "jumpId": 10023,
"introduce": { "introduce": {
"key": "gamesummary_node_introdunce_3", "key": "gamesummary_node_introdunce_3",
"text": "狩猎-巨型猩猩" "text": "月圆之夜，它带着饥饿与愤怒而来。只有堆积如山的香蕉能平息它的怒火。"
}, },
"bg": "hkz_wftj_sl02", "bg": "hkz_wftj_sl02",
"icon": "wjyz_img016", "icon": "wjyz_img016",
@ -114,7 +114,7 @@
"jumpId": 10025, "jumpId": 10025,
"introduce": { "introduce": {
"key": "gamesummary_node_introdunce_4", "key": "gamesummary_node_introdunce_4",
"text": "狩猎-大厨" "text": "大厨因为没抓到精灵们而被放逐，对精灵恨之入骨，誓要将精灵赶尽杀绝。"
}, },
"bg": "hkz_wftj_sl01", "bg": "hkz_wftj_sl01",
"icon": "wjyz_img014", "icon": "wjyz_img014",
@ -140,7 +140,7 @@
"id": 5, "id": 5,
"name": { "name": {
"key": "gamesummary_node_name_5", "key": "gamesummary_node_name_5",
"text": "狩猎-太空海星" "text": "狩猎-戈格星人"
}, },
"tabId": 4, "tabId": 4,
"mapPos": { "mapPos": {
@ -152,7 +152,7 @@
"jumpId": 10026, "jumpId": 10026,
"introduce": { "introduce": {
"key": "gamesummary_node_introdunce_5", "key": "gamesummary_node_introdunce_5",
"text": "狩猎-太空海星" "text": "波波星人带走了戈格星人的孩子，自此戈格星人开始了对波波星人的追击之旅。"
}, },
"bg": "hkz_wftj_sl03", "bg": "hkz_wftj_sl03",
"icon": "wjyz_img017", "icon": "wjyz_img017",
@ -190,7 +190,7 @@
"jumpId": 10024, "jumpId": 10024,
"introduce": { "introduce": {
"key": "gamesummary_node_introdunce_6", "key": "gamesummary_node_introdunce_6",
"text": "狩猎-火龙" "text": "盘踞在城堡中看守着财富和公主的巨龙，最讨厌一些不速之客擅闯她的领地。"
}, },
"bg": "hkz_wftj_sl04", "bg": "hkz_wftj_sl04",
"icon": "wjyz_img015", "icon": "wjyz_img015",
@ -228,7 +228,7 @@
"jumpId": 10022, "jumpId": 10022,
"introduce": { "introduce": {
"key": "gamesummary_node_introdunce_7", "key": "gamesummary_node_introdunce_7",
"text": "维京远征-火焰泰坦" "text": "贝洛克唤醒沉睡千年的火焰泰坦，火焰将大地燃烧殆尽，三泰坦一旦汇合，世界将因此毁灭。"
}, },
"bg": "hkz_wftj_wjyz03", "bg": "hkz_wftj_wjyz03",
"icon": "wjyz_img012", "icon": "wjyz_img012",
@ -271,7 +271,7 @@
"jumpId": 10020, "jumpId": 10020,
"introduce": { "introduce": {
"key": "gamesummary_node_introdunce_8", "key": "gamesummary_node_introdunce_8",
"text": "维京远征-冰霜泰坦" "text": "斯卡尔唤醒沉睡千年的冰霜泰坦，所过之处皆冻结出寒冷的冰山，三泰坦一旦汇合，世界将因此毁灭。"
}, },
"bg": "hkz_wftj_wjyz02", "bg": "hkz_wftj_wjyz02",
"icon": "wjyz_img011", "icon": "wjyz_img011",
@ -314,7 +314,7 @@
"jumpId": 10021, "jumpId": 10021,
"introduce": { "introduce": {
"key": "gamesummary_node_introdunce_9", "key": "gamesummary_node_introdunce_9",
"text": "维京远征-森林泰坦" "text": "贝洛克与斯卡尔胁迫娜璃唤醒沉睡千年的森林泰坦，藤蔓蜿蜒千里，三泰坦一旦汇合，世界将因此毁灭。"
}, },
"bg": "hkz_wftj_wjyz01", "bg": "hkz_wftj_wjyz01",
"icon": "wjyz_img013", "icon": "wjyz_img013",
@ -357,7 +357,7 @@
"jumpId": 10013, "jumpId": 10013,
"introduce": { "introduce": {
"key": "gamesummary_node_introdunce_10", "key": "gamesummary_node_introdunce_10",
"text": "梦境回廊" "text": "美丽，梦幻与诡异兼具，这便是沙人建造的梦境回廊。守护者们可在此磨练技艺。"
}, },
"bg": "hkz_wftj_jyfb", "bg": "hkz_wftj_jyfb",
"icon": "wjyz_img011", "icon": "wjyz_img011",
@ -383,7 +383,7 @@
"id": 11, "id": 11,
"name": { "name": {
"key": "gamesummary_node_name_11", "key": "gamesummary_node_name_11",
"text": "功夫大师挑战塔" "text": "炼金塔"
}, },
"tabId": 6, "tabId": 6,
"mapPos": { "mapPos": {
@ -395,7 +395,7 @@
"jumpId": 10004, "jumpId": 10004,
"introduce": { "introduce": {
"key": "gamesummary_node_introdunce_11", "key": "gamesummary_node_introdunce_11",
"text": "功夫大师挑战塔" "text": "顽石需历经千锤百炼，方可提炼成金。这里是师傅为挑战自我者而修建的地方。"
}, },
"bg": "hkz_wftj_wjyz01", "bg": "hkz_wftj_wjyz01",
"icon": "fb_rk_wj1", "icon": "fb_rk_wj1",
@ -421,7 +421,7 @@
"id": 12, "id": 12,
"name": { "name": {
"key": "gamesummary_node_name_12", "key": "gamesummary_node_name_12",
"text": "功夫大师循环塔" "text": "无极塔"
}, },
"tabId": 6, "tabId": 6,
"mapPos": { "mapPos": {
@ -433,7 +433,7 @@
"jumpId": 10017, "jumpId": 10017,
"introduce": { "introduce": {
"key": "gamesummary_node_introdunce_12", "key": "gamesummary_node_introdunce_12",
"text": "功夫大师循环塔" "text": "无穷无尽的试炼，越来越棘手的对手。这里是师傅为穷尽武道者而修建的地方。"
}, },
"bg": "hkz_wftj_wjyz01", "bg": "hkz_wftj_wjyz01",
"icon": "fb_rk_wj1", "icon": "fb_rk_wj1",
@ -454,7 +454,7 @@
"id": 13, "id": 13,
"name": { "name": {
"key": "gamesummary_node_name_13", "key": "gamesummary_node_name_13",
"text": "功夫大师阵营塔" "text": "六合塔"
}, },
"tabId": 6, "tabId": 6,
"mapPos": { "mapPos": {
@ -466,7 +466,7 @@
"jumpId": 10018, "jumpId": 10018,
"introduce": { "introduce": {
"key": "gamesummary_node_introdunce_13", "key": "gamesummary_node_introdunce_13",
"text": "功夫大师阵营塔" "text": "天下万物，相生相克。掌握了相克的原理，以弱胜强者不在少数。这里是师傅为研究阵营克制者而修建的地方。"
}, },
"bg": "hkz_wftj_wjyz01", "bg": "hkz_wftj_wjyz01",
"icon": "fb_rk_wj1", "icon": "fb_rk_wj1",
@ -499,7 +499,7 @@
"jumpId": 11001, "jumpId": 11001,
"introduce": { "introduce": {
"key": "gamesummary_node_introdunce_14", "key": "gamesummary_node_introdunce_14",
"text": "巨怪商队" "text": "去往神秘的远方，探索未知的宇宙，交易珍稀的宝藏！为了充实巨怪市集，巨怪们踏上了列车，开启了漫长的旅途。"
}, },
"bg": "hkz_wftj_jsg", "bg": "hkz_wftj_jsg",
"icon": "rw_cj_icon16", "icon": "rw_cj_icon16",
@ -532,7 +532,7 @@
"jumpId": 10027, "jumpId": 10027,
"introduce": { "introduce": {
"key": "gamesummary_node_introdunce_16", "key": "gamesummary_node_introdunce_16",
"text": "石阵秘境" "text": "史前板块运动形成的天然巨石阵迷宫，道路错综复杂，幽深莫测，原始人们是如何从这里逃出生天的呢？"
}, },
"bg": "hkz_wftj_jsg", "bg": "hkz_wftj_jsg",
"icon": "rw_cj_icon01", "icon": "rw_cj_icon01",

12
bin/json/game_item.json
View File

@ -14684,7 +14684,7 @@
"id": "10000036", "id": "10000036",
"name": { "name": {
"key": "item_item_name_369", "key": "item_item_name_369",
"text": "石阵玩法货币" "text": "宝螺贝"
}, },
"usetype": 1, "usetype": 1,
"color": 5, "color": 5,
@ -14707,7 +14707,7 @@
"img": "item_10000035", "img": "item_10000035",
"intr": { "intr": {
"key": "item_item_intr_378", "key": "item_item_intr_378",
"text": "暂无包装" "text": "原始社会最常见的货币，在搁浅的沙滩上很容易找到它。光滑小巧的个头方便携带，又受人们喜爱。"
}, },
"sale": [ "sale": [
{ {
@ -14721,7 +14721,7 @@
"id": "10000037", "id": "10000037",
"name": { "name": {
"key": "item_item_name_370", "key": "item_item_name_370",
"text": "石阵天赋树货币" "text": "智慧水晶"
}, },
"usetype": 1, "usetype": 1,
"color": 5, "color": 5,
@ -14744,7 +14744,7 @@
"img": "item_10000035", "img": "item_10000035",
"intr": { "intr": {
"key": "item_item_intr_379", "key": "item_item_intr_379",
"text": "暂无包装" "text": "迷宫中的美丽水晶，波澜浮光的棕红，是石洞天然形成的瑰宝。它拥有特殊的能量，将它握在手中，能使感官大幅度增强。（注意要和巨怪商队中的画的不一样）"
}, },
"sale": [ "sale": [
{ {
@ -14781,7 +14781,7 @@
"img": "item_10000035", "img": "item_10000035",
"intr": { "intr": {
"key": "item_item_intr_380", "key": "item_item_intr_380",
"text": "暂无包装" "text": "鹦鹉螺较为罕见，又因其外形精巧美丽，因此成为稀缺货币的代名词。人们即使历经磨难也只能得到很少的鹦鹉螺，收到它作为奖励是一件非常自豪骄傲的事。"
}, },
"sale": [ "sale": [
{ {
@ -14795,7 +14795,7 @@
"id": "22100001", "id": "22100001",
"name": { "name": {
"key": "item_item_name_372", "key": "item_item_name_372",
"text": "演练抽奖券" "text": "智慧水晶"
}, },
"usetype": 2, "usetype": 2,
"color": 5, "color": 5,

241
bin/json/game_mainstage.json
View File

@ -520,7 +520,7 @@
"Person/44005/44005_exhibition.prefab" "Person/44005/44005_exhibition.prefab"
], ],
"herocolor": 1, "herocolor": 1,
"heroimg": "zxgq_js_51004", "heroimg": "zxgq_js_33001",
"bubbletext": { "bubbletext": {
"key": "main_stage_bubbletext_6", "key": "main_stage_bubbletext_6",
"text": "吃饱喝足，快向瓜哥询问月光原石的线索！" "text": "吃饱喝足，快向瓜哥询问月光原石的线索！"
@ -4262,7 +4262,7 @@
100123 100123
], ],
"previoustage": 0, "previoustage": 0,
"Episodetype": 7, "Episodetype": 2,
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
"venturemodel": "", "venturemodel": "",
@ -4300,13 +4300,7 @@
"hero_exp": 0, "hero_exp": 0,
"ps_consume": [], "ps_consume": [],
"ps_mg": [], "ps_mg": [],
"firstaward": [ "firstaward": [],
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"lotteryward": 0, "lotteryward": 0,
"commonaward": [], "commonaward": [],
"BattleReadyID": 0, "BattleReadyID": 0,
@ -4321,9 +4315,7 @@
"chapterid": 11001, "chapterid": 11001,
"group_id": 100125, "group_id": 100125,
"previous_group_id": [ "previous_group_id": [
100121, 100109
100122,
100123
], ],
"previoustage": 0, "previoustage": 0,
"Episodetype": 5, "Episodetype": 5,
@ -4364,7 +4356,13 @@
"hero_exp": 0, "hero_exp": 0,
"ps_consume": [], "ps_consume": [],
"ps_mg": [], "ps_mg": [],
"firstaward": [], "firstaward": [
{
"a": "item",
"t": "10000001",
"n": 1
}
],
"lotteryward": 0, "lotteryward": 0,
"commonaward": [], "commonaward": [],
"BattleReadyID": 0, "BattleReadyID": 0,
@ -4379,9 +4377,7 @@
"chapterid": 11001, "chapterid": 11001,
"group_id": 100126, "group_id": 100126,
"previous_group_id": [ "previous_group_id": [
100121, 100109
100122,
100123
], ],
"previoustage": 0, "previoustage": 0,
"Episodetype": 7, "Episodetype": 7,
@ -4397,7 +4393,7 @@
"text": "测试节点9" "text": "测试节点9"
}, },
"animation": "", "animation": "",
"hide": 0, "hide": 1,
"destroy": 1, "destroy": 1,
"progress": 0, "progress": 0,
"frontstoryid": 0, "frontstoryid": 0,
@ -4426,7 +4422,7 @@
{ {
"a": "item", "a": "item",
"t": "10000001", "t": "10000001",
"n": 10 "n": 1
} }
], ],
"lotteryward": 0, "lotteryward": 0,
@ -4443,9 +4439,7 @@
"chapterid": 11001, "chapterid": 11001,
"group_id": 100127, "group_id": 100127,
"previous_group_id": [ "previous_group_id": [
100121, 100112
100122,
100123
], ],
"previoustage": 0, "previoustage": 0,
"Episodetype": 5, "Episodetype": 5,
@ -5243,9 +5237,7 @@
"chapterid": 11001, "chapterid": 11001,
"group_id": 100135, "group_id": 100135,
"previous_group_id": [ "previous_group_id": [
100121, 100105
100122,
100123
], ],
"previoustage": 0, "previoustage": 0,
"Episodetype": 7, "Episodetype": 7,
@ -5307,9 +5299,7 @@
"chapterid": 11001, "chapterid": 11001,
"group_id": 100136, "group_id": 100136,
"previous_group_id": [ "previous_group_id": [
100121, 100135
100122,
100123
], ],
"previoustage": 0, "previoustage": 0,
"Episodetype": 7, "Episodetype": 7,
@ -5371,9 +5361,7 @@
"chapterid": 11001, "chapterid": 11001,
"group_id": 100137, "group_id": 100137,
"previous_group_id": [ "previous_group_id": [
100121, 100136
100122,
100123
], ],
"previoustage": 0, "previoustage": 0,
"Episodetype": 7, "Episodetype": 7,
@ -5435,9 +5423,9 @@
"chapterid": 11001, "chapterid": 11001,
"group_id": 100138, "group_id": 100138,
"previous_group_id": [ "previous_group_id": [
100121, 100135,
100122, 100136,
100123 100137
], ],
"previoustage": 0, "previoustage": 0,
"Episodetype": 7, "Episodetype": 7,
@ -5454,7 +5442,7 @@
}, },
"animation": "", "animation": "",
"hide": 1, "hide": 1,
"destroy": 0, "destroy": 1,
"progress": 0, "progress": 0,
"frontstoryid": 0, "frontstoryid": 0,
"afterstoryid": 0, "afterstoryid": 0,
@ -5499,9 +5487,7 @@
"chapterid": 11001, "chapterid": 11001,
"group_id": 100139, "group_id": 100139,
"previous_group_id": [ "previous_group_id": [
100121, 100103
100122,
100123
], ],
"previoustage": 0, "previoustage": 0,
"Episodetype": 7, "Episodetype": 7,
@ -5517,8 +5503,8 @@
"text": "测试节点22" "text": "测试节点22"
}, },
"animation": "", "animation": "",
"hide": 1, "hide": 0,
"destroy": 0, "destroy": 1,
"progress": 0, "progress": 0,
"frontstoryid": 0, "frontstoryid": 0,
"afterstoryid": 0, "afterstoryid": 0,
@ -5563,9 +5549,7 @@
"chapterid": 11001, "chapterid": 11001,
"group_id": 100140, "group_id": 100140,
"previous_group_id": [ "previous_group_id": [
100121, 100139
100122,
100123
], ],
"previoustage": 0, "previoustage": 0,
"Episodetype": 7, "Episodetype": 7,
@ -5581,8 +5565,8 @@
"text": "测试节点23" "text": "测试节点23"
}, },
"animation": "", "animation": "",
"hide": 1, "hide": 0,
"destroy": 0, "destroy": 1,
"progress": 0, "progress": 0,
"frontstoryid": 0, "frontstoryid": 0,
"afterstoryid": 0, "afterstoryid": 0,
@ -5627,9 +5611,7 @@
"chapterid": 11001, "chapterid": 11001,
"group_id": 100141, "group_id": 100141,
"previous_group_id": [ "previous_group_id": [
100121, 100140
100122,
100123
], ],
"previoustage": 0, "previoustage": 0,
"Episodetype": 7, "Episodetype": 7,
@ -5645,8 +5627,8 @@
"text": "测试节点24" "text": "测试节点24"
}, },
"animation": "", "animation": "",
"hide": 1, "hide": 0,
"destroy": 0, "destroy": 1,
"progress": 0, "progress": 0,
"frontstoryid": 0, "frontstoryid": 0,
"afterstoryid": 0, "afterstoryid": 0,
@ -5691,9 +5673,7 @@
"chapterid": 11001, "chapterid": 11001,
"group_id": 100142, "group_id": 100142,
"previous_group_id": [ "previous_group_id": [
100121, 100141
100122,
100123
], ],
"previoustage": 0, "previoustage": 0,
"Episodetype": 7, "Episodetype": 7,
@ -5710,7 +5690,7 @@
}, },
"animation": "", "animation": "",
"hide": 1, "hide": 1,
"destroy": 0, "destroy": 1,
"progress": 0, "progress": 0,
"frontstoryid": 0, "frontstoryid": 0,
"afterstoryid": 0, "afterstoryid": 0,
@ -5755,9 +5735,7 @@
"chapterid": 11001, "chapterid": 11001,
"group_id": 100143, "group_id": 100143,
"previous_group_id": [ "previous_group_id": [
100121, 100107
100122,
100123
], ],
"previoustage": 0, "previoustage": 0,
"Episodetype": 7, "Episodetype": 7,
@ -5819,9 +5797,7 @@
"chapterid": 11001, "chapterid": 11001,
"group_id": 100144, "group_id": 100144,
"previous_group_id": [ "previous_group_id": [
100121, 100143
100122,
100123
], ],
"previoustage": 0, "previoustage": 0,
"Episodetype": 7, "Episodetype": 7,
@ -5883,9 +5859,7 @@
"chapterid": 11001, "chapterid": 11001,
"group_id": 100145, "group_id": 100145,
"previous_group_id": [ "previous_group_id": [
100121, 100144
100122,
100123
], ],
"previoustage": 0, "previoustage": 0,
"Episodetype": 7, "Episodetype": 7,
@ -5947,12 +5921,10 @@
"chapterid": 11001, "chapterid": 11001,
"group_id": 100146, "group_id": 100146,
"previous_group_id": [ "previous_group_id": [
100121, 100145
100122,
100123
], ],
"previoustage": 0, "previoustage": 0,
"Episodetype": 5, "Episodetype": 7,
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
"venturemodel": "", "venturemodel": "",
@ -5965,8 +5937,8 @@
"text": "测试节点29" "text": "测试节点29"
}, },
"animation": "", "animation": "",
"hide": 0, "hide": 1,
"destroy": 0, "destroy": 1,
"progress": 0, "progress": 0,
"frontstoryid": 0, "frontstoryid": 0,
"afterstoryid": 0, "afterstoryid": 0,
@ -5990,7 +5962,13 @@
"hero_exp": 0, "hero_exp": 0,
"ps_consume": [], "ps_consume": [],
"ps_mg": [], "ps_mg": [],
"firstaward": [], "firstaward": [
{
"a": "item",
"t": "13003004",
"n": 1
}
],
"lotteryward": 0, "lotteryward": 0,
"commonaward": [], "commonaward": [],
"BattleReadyID": 0, "BattleReadyID": 0,
@ -6005,9 +5983,7 @@
"chapterid": 11001, "chapterid": 11001,
"group_id": 100147, "group_id": 100147,
"previous_group_id": [ "previous_group_id": [
100121, 100113
100122,
100123
], ],
"previoustage": 0, "previoustage": 0,
"Episodetype": 1, "Episodetype": 1,
@ -6023,11 +5999,11 @@
"text": "测试节点30" "text": "测试节点30"
}, },
"animation": "", "animation": "",
"hide": 0, "hide": 1,
"destroy": 0, "destroy": 0,
"progress": 0, "progress": 0,
"frontstoryid": 20105, "frontstoryid": 0,
"afterstoryid": 20107, "afterstoryid": 0,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
"text": "" "text": ""
@ -6111,12 +6087,10 @@
"chapterid": 11001, "chapterid": 11001,
"group_id": 100148, "group_id": 100148,
"previous_group_id": [ "previous_group_id": [
100121, 100150
100122,
100123
], ],
"previoustage": 0, "previoustage": 0,
"Episodetype": 5, "Episodetype": 7,
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
"venturemodel": "", "venturemodel": "",
@ -6129,8 +6103,8 @@
"text": "测试节点31" "text": "测试节点31"
}, },
"animation": "", "animation": "",
"hide": 0, "hide": 1,
"destroy": 0, "destroy": 1,
"progress": 0, "progress": 0,
"frontstoryid": 0, "frontstoryid": 0,
"afterstoryid": 0, "afterstoryid": 0,
@ -6154,7 +6128,13 @@
"hero_exp": 0, "hero_exp": 0,
"ps_consume": [], "ps_consume": [],
"ps_mg": [], "ps_mg": [],
"firstaward": [], "firstaward": [
{
"a": "item",
"t": "10000001",
"n": 3
}
],
"lotteryward": 0, "lotteryward": 0,
"commonaward": [], "commonaward": [],
"BattleReadyID": 0, "BattleReadyID": 0,
@ -6169,9 +6149,7 @@
"chapterid": 11001, "chapterid": 11001,
"group_id": 100149, "group_id": 100149,
"previous_group_id": [ "previous_group_id": [
100121, 100107
100122,
100123
], ],
"previoustage": 0, "previoustage": 0,
"Episodetype": 7, "Episodetype": 7,
@ -6188,7 +6166,7 @@
}, },
"animation": "", "animation": "",
"hide": 1, "hide": 1,
"destroy": 0, "destroy": 1,
"progress": 0, "progress": 0,
"frontstoryid": 0, "frontstoryid": 0,
"afterstoryid": 0, "afterstoryid": 0,
@ -6215,8 +6193,8 @@
"firstaward": [ "firstaward": [
{ {
"a": "item", "a": "item",
"t": "13003004", "t": "10000001",
"n": 1 "n": 2
} }
], ],
"lotteryward": 0, "lotteryward": 0,
@ -6233,9 +6211,7 @@
"chapterid": 11001, "chapterid": 11001,
"group_id": 100150, "group_id": 100150,
"previous_group_id": [ "previous_group_id": [
100121, 100115
100122,
100123
], ],
"previoustage": 0, "previoustage": 0,
"Episodetype": 7, "Episodetype": 7,
@ -6251,8 +6227,8 @@
"text": "测试节点33" "text": "测试节点33"
}, },
"animation": "", "animation": "",
"hide": 1, "hide": 0,
"destroy": 0, "destroy": 1,
"progress": 0, "progress": 0,
"frontstoryid": 0, "frontstoryid": 0,
"afterstoryid": 0, "afterstoryid": 0,
@ -6279,7 +6255,7 @@
"firstaward": [ "firstaward": [
{ {
"a": "item", "a": "item",
"t": "13001001", "t": "10000001",
"n": 1 "n": 1
} }
], ],
@ -6297,9 +6273,7 @@
"chapterid": 11001, "chapterid": 11001,
"group_id": 100151, "group_id": 100151,
"previous_group_id": [ "previous_group_id": [
100121, 100114
100122,
100123
], ],
"previoustage": 0, "previoustage": 0,
"Episodetype": 1, "Episodetype": 1,
@ -6315,7 +6289,7 @@
"text": "测试节点34" "text": "测试节点34"
}, },
"animation": "", "animation": "",
"hide": 0, "hide": 1,
"destroy": 0, "destroy": 0,
"progress": 0, "progress": 0,
"frontstoryid": 0, "frontstoryid": 0,
@ -6398,6 +6372,77 @@
], ],
"challengeward": 0 "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, "id": 1100201,
"chapterid": 11002, "chapterid": 11002,

10
bin/json/game_skillafteratk.json
View File

@ -20563,7 +20563,7 @@
"From": 4, "From": 4,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 2,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 1, "Type": 1,
"Argu": [ "Argu": [
@ -20571,10 +20571,10 @@
4, 4,
4000 4000
], ],
"FollowSK": [], "FollowSK": [
"SucFollowSK": [
243001313 243001313
], ],
"SucFollowSK": [],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
"DpsRevisiType": 0, "DpsRevisiType": 0,
@ -20597,9 +20597,7 @@
4000 4000
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [ "SucFollowSK": [],
243001313
],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
"DpsRevisiType": 0, "DpsRevisiType": 0,

15
bin/json/game_skillatk.json
View File

@ -15482,8 +15482,7 @@
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
243001311, 243001311
243001312
] ]
}, },
"Desc": { "Desc": {
@ -15514,8 +15513,7 @@
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
243001321, 243001321
243001312
] ]
}, },
"Desc": { "Desc": {
@ -15546,8 +15544,7 @@
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
243001331, 243001331
243001312
] ]
}, },
"Desc": { "Desc": {
@ -15578,8 +15575,7 @@
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
243001341, 243001341
243001312
] ]
}, },
"Desc": { "Desc": {
@ -15610,8 +15606,7 @@
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
243001351, 243001351
243001312
] ]
}, },
"Desc": { "Desc": {

52
bin/json/game_worldall.json
View File

@ -107,58 +107,6 @@
}, },
"reword": [] "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, "id": 1010,
"name": { "name": {

2
bin/json/game_worldbattle.json
View File

@ -18,7 +18,7 @@
"FormatList": [ "FormatList": [
700012 700012
], ],
"BattleReadyID": 126, "BattleReadyID": 127,
"EventList": [], "EventList": [],
"playexp": { "playexp": {
"a": "attr", "a": "attr",

203
bin/json/game_worldrd.json
View File

@ -6,7 +6,7 @@
"key": "eventname_1", "key": "eventname_1",
"text": "无事发生" "text": "无事发生"
}, },
"eventweight": 1000, "eventweight": 40000,
"eventtype": 0, "eventtype": 0,
"battleready": 0, "battleready": 0,
"battleid": 0, "battleid": 0,
@ -19,10 +19,10 @@
"key": "eventname_2", "key": "eventname_2",
"text": "打怪" "text": "打怪"
}, },
"eventweight": 1000, "eventweight": 30000,
"eventtype": 1, "eventtype": 1,
"battleready": 126, "battleready": 126,
"battleid": 720001, "battleid": 101011,
"getitem": [] "getitem": []
}, },
{ {
@ -30,26 +30,38 @@
"group": 1001, "group": 1001,
"eventname": { "eventname": {
"key": "eventname_3", "key": "eventname_3",
"text": "打怪" "text": "获取金币"
}, },
"eventweight": 1000, "eventweight": 10000,
"eventtype": 1, "eventtype": 2,
"battleready": 126, "battleready": 0,
"battleid": 720001, "battleid": 0,
"getitem": [] "getitem": [
{
"a": "attr",
"t": "gold",
"n": 10000
}
]
}, },
{ {
"id": 4, "id": 4,
"group": 1001, "group": 1001,
"eventname": { "eventname": {
"key": "eventname_4", "key": "eventname_4",
"text": "打怪" "text": "获取金币"
}, },
"eventweight": 1000, "eventweight": 10000,
"eventtype": 1, "eventtype": 0,
"battleready": 126, "battleready": 0,
"battleid": 720001, "battleid": 0,
"getitem": [] "getitem": [
{
"a": "attr",
"t": "gold",
"n": 38000
}
]
}, },
{ {
"id": 5, "id": 5,
@ -58,6 +70,77 @@
"key": "eventname_5", "key": "eventname_5",
"text": "获取金币" "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, "eventweight": 1000,
"eventtype": 2, "eventtype": 2,
"battleready": 0, "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, "id": 11,
"group": 1002, "group": 1002,
@ -152,25 +164,6 @@
"eventtype": 2, "eventtype": 2,
"battleready": 0, "battleready": 0,
"battleid": 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": [ "getitem": [
{ {
"a": "attr", "a": "attr",

355
bin/json/game_worldtask.json
View File

@ -117,11 +117,6 @@
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 8200 "n": 8200
},
{
"a": "hero",
"t": "44004",
"n": 1
} }
], ],
"module": [] "module": []
@ -5579,9 +5574,9 @@
"opencond": "", "opencond": "",
"lock": 1, "lock": 1,
"lockend": 999, "lockend": 999,
"ontxe": 20220, "ontxe": 300020,
"id_after": 300040, "id_after": 300040,
"group": 302, "group": 301,
"exgroup": 310, "exgroup": 310,
"des": 3, "des": 3,
"icon": "25001", "icon": "25001",
@ -5623,7 +5618,7 @@
"lockend": 999, "lockend": 999,
"ontxe": 300030, "ontxe": 300030,
"id_after": 300050, "id_after": 300050,
"group": 302, "group": 301,
"exgroup": 310, "exgroup": 310,
"des": 3, "des": 3,
"icon": "25001", "icon": "25001",
@ -5665,7 +5660,7 @@
"lockend": 999, "lockend": 999,
"ontxe": 300040, "ontxe": 300040,
"id_after": 300060, "id_after": 300060,
"group": 302, "group": 301,
"exgroup": 310, "exgroup": 310,
"des": 3, "des": 3,
"icon": "25001", "icon": "25001",
@ -5707,7 +5702,7 @@
"lockend": 999, "lockend": 999,
"ontxe": 300050, "ontxe": 300050,
"id_after": 300061, "id_after": 300061,
"group": 302, "group": 301,
"exgroup": 310, "exgroup": 310,
"des": 3, "des": 3,
"icon": "25001", "icon": "25001",
@ -5747,7 +5742,7 @@
"lockend": 999, "lockend": 999,
"ontxe": 300060, "ontxe": 300060,
"id_after": 300062, "id_after": 300062,
"group": 303, "group": 301,
"exgroup": 310, "exgroup": 310,
"des": 3, "des": 3,
"icon": "25001", "icon": "25001",
@ -5787,7 +5782,7 @@
"lockend": 999, "lockend": 999,
"ontxe": 300061, "ontxe": 300061,
"id_after": 0, "id_after": 0,
"group": 303, "group": 301,
"exgroup": 310, "exgroup": 310,
"des": 3, "des": 3,
"icon": "25001", "icon": "25001",
@ -5825,9 +5820,9 @@
"opencond": "", "opencond": "",
"lock": 1, "lock": 1,
"lockend": 999, "lockend": 999,
"ontxe": 300060, "ontxe": 300062,
"id_after": 0, "id_after": 0,
"group": 304, "group": 301,
"exgroup": 310, "exgroup": 310,
"des": 3, "des": 3,
"icon": "25001", "icon": "25001",
@ -5867,7 +5862,7 @@
"lockend": 999, "lockend": 999,
"ontxe": 300070, "ontxe": 300070,
"id_after": 0, "id_after": 0,
"group": 305, "group": 301,
"exgroup": 310, "exgroup": 310,
"des": 3, "des": 3,
"icon": "25001", "icon": "25001",
@ -5937,7 +5932,17 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 500 "n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
} }
], ],
"module": [] "module": []
@ -5979,7 +5984,17 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 501 "n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
} }
], ],
"module": [] "module": []
@ -5990,8 +6005,8 @@
"lock": 1, "lock": 1,
"lockend": 999, "lockend": 999,
"ontxe": 0, "ontxe": 0,
"id_after": 100040, "id_after": 0,
"group": 1030, "group": 1020,
"exgroup": 110, "exgroup": 110,
"des": 1, "des": 1,
"icon": "25001", "icon": "25001",
@ -6021,7 +6036,17 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 502 "n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
} }
], ],
"module": [] "module": []
@ -6031,7 +6056,7 @@
"opencond": "", "opencond": "",
"lock": 1, "lock": 1,
"lockend": 999, "lockend": 999,
"ontxe": 100030, "ontxe": 0,
"id_after": 0, "id_after": 0,
"group": 1030, "group": 1030,
"exgroup": 110, "exgroup": 110,
@ -6063,7 +6088,17 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 503 "n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
} }
], ],
"module": [] "module": []
@ -6074,8 +6109,8 @@
"lock": 1, "lock": 1,
"lockend": 999, "lockend": 999,
"ontxe": 0, "ontxe": 0,
"id_after": 100060, "id_after": 0,
"group": 1050, "group": 1040,
"exgroup": 110, "exgroup": 110,
"des": 1, "des": 1,
"icon": "25001", "icon": "25001",
@ -6105,7 +6140,17 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 504 "n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
} }
], ],
"module": [] "module": []
@ -6115,8 +6160,8 @@
"opencond": "", "opencond": "",
"lock": 1, "lock": 1,
"lockend": 999, "lockend": 999,
"ontxe": 100050, "ontxe": 0,
"id_after": 100070, "id_after": 0,
"group": 1050, "group": 1050,
"exgroup": 110, "exgroup": 110,
"des": 1, "des": 1,
@ -6147,7 +6192,17 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 505 "n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
} }
], ],
"module": [] "module": []
@ -6157,9 +6212,9 @@
"opencond": "", "opencond": "",
"lock": 1, "lock": 1,
"lockend": 999, "lockend": 999,
"ontxe": 100060, "ontxe": 0,
"id_after": 0, "id_after": 0,
"group": 1050, "group": 1060,
"exgroup": 110, "exgroup": 110,
"des": 1, "des": 1,
"icon": "25001", "icon": "25001",
@ -6189,7 +6244,17 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 506 "n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
} }
], ],
"module": [] "module": []
@ -6231,7 +6296,17 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 507 "n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
} }
], ],
"module": [] "module": []
@ -6273,7 +6348,17 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 508 "n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
} }
], ],
"module": [] "module": []
@ -6315,7 +6400,17 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 509 "n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
} }
], ],
"module": [] "module": []
@ -6357,7 +6452,17 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 510 "n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
} }
], ],
"module": [] "module": []
@ -6399,7 +6504,17 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 511 "n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
} }
], ],
"module": [] "module": []
@ -6441,7 +6556,17 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 512 "n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
} }
], ],
"module": [] "module": []
@ -6483,7 +6608,17 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 513 "n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
} }
], ],
"module": [] "module": []
@ -6525,7 +6660,17 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 514 "n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
} }
], ],
"module": [] "module": []
@ -6567,7 +6712,17 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 515 "n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
} }
], ],
"module": [] "module": []
@ -6609,7 +6764,17 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 516 "n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
} }
], ],
"module": [] "module": []
@ -6651,7 +6816,17 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 517 "n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
} }
], ],
"module": [] "module": []
@ -6693,7 +6868,17 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 518 "n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
} }
], ],
"module": [] "module": []
@ -6735,7 +6920,17 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 519 "n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
} }
], ],
"module": [] "module": []
@ -6777,7 +6972,17 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 520 "n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
} }
], ],
"module": [] "module": []
@ -6819,7 +7024,17 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 521 "n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
} }
], ],
"module": [] "module": []
@ -6861,7 +7076,17 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 522 "n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
} }
], ],
"module": [] "module": []
@ -6903,7 +7128,17 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 523 "n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
} }
], ],
"module": [] "module": []
@ -6945,7 +7180,17 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 524 "n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
} }
], ],
"module": [] "module": []
@ -6987,7 +7232,17 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 525 "n": 5000
},
{
"a": "attr",
"t": "ps",
"n": 10
},
{
"a": "attr",
"t": "diamond",
"n": 10
} }
], ],
"module": [] "module": []

19
comm/const.go
View File

@ -521,8 +521,10 @@ const (
Reddot10 ReddotType = 10010 //英雄----共鸣红点 前端处理 Reddot10 ReddotType = 10010 //英雄----共鸣红点 前端处理
Reddot20301 ReddotType = 20301 //英雄----升星红点 前端处理 Reddot20301 ReddotType = 20301 //英雄----升星红点 前端处理
//公会 //公会
Reddot15102 ReddotType = 15102 //公会----签到红点 Reddot15102 ReddotType = 15102 //公会----签到红点 今日剩余签到
Reddot15201 ReddotType = 15201 //公会----申请红点 Reddot15201 ReddotType = 15201 //公会----申请红点
Reddot15301 ReddotType = 15301 //公会----公会副本 今日剩余挑战次数：x
Reddot15401 ReddotType = 15401 //公会----公会任务 今日剩余任务：x
//主线关卡 //主线关卡
//Reddot11100 ReddotType = 11100 //主线关卡----可挑战红点 -- 废弃 //Reddot11100 ReddotType = 11100 //主线关卡----可挑战红点 -- 废弃
// 铁匠铺 // 铁匠铺
@ -533,6 +535,7 @@ const (
//竞技场 //竞技场
Reddot22100 ReddotType = 22100 //当玩家竞技场可挑战次数到达最大时 Reddot22100 ReddotType = 22100 //当玩家竞技场可挑战次数到达最大时
Reddot22102 ReddotType = 22102 //当竞技场npc可以挑战时 Reddot22102 ReddotType = 22102 //当竞技场npc可以挑战时
Reddot22202 ReddotType = 22202 //今日剩余挑战券：x
Reddot6 ReddotType = 10006 //爬塔----可挑战红点 Reddot6 ReddotType = 10006 //爬塔----可挑战红点
Reddot7 ReddotType = 10007 //爬塔----奖励红点 Reddot7 ReddotType = 10007 //爬塔----奖励红点
@ -542,7 +545,8 @@ const (
Reddot20 ReddotType = 10020 //丛林美食馆----可挂机红点 Reddot20 ReddotType = 10020 //丛林美食馆----可挂机红点
Reddot21 ReddotType = 10021 //丛林美食馆----可升级红点 Reddot21 ReddotType = 10021 //丛林美食馆----可升级红点
Reddot22 ReddotType = 10022 //丛林美食馆----可领取奖励红 Reddot22 ReddotType = 10022 //丛林美食馆----可领取奖励红
Reddot23 ReddotType = 10023 //熊猫武馆----可挂机红点 // 武馆
Reddot23 ReddotType = 10023 //熊猫武馆----可挂机红点 今日剩余训练次数：x
Reddot24 ReddotType = 10024 //熊猫武馆----可升级红点 Reddot24 ReddotType = 10024 //熊猫武馆----可升级红点
Reddot25 ReddotType = 10025 //熊猫武馆----可领取奖励红点 Reddot25 ReddotType = 10025 //熊猫武馆----可领取奖励红点
Reddot33 ReddotType = 10033 //附魔副本 有挑战次数 Reddot33 ReddotType = 10033 //附魔副本 有挑战次数
@ -560,6 +564,17 @@ const (
//23101 烹饪 //23101 烹饪
Reddot23101 ReddotType = 23101 // 烹饪奖励菜谱图鉴图标 Reddot23101 ReddotType = 23101 // 烹饪奖励菜谱图鉴图标
//每日任务
Reddot25101 ReddotType = 25101 // 每日任务进度红点
//武馆
Reddot26101 ReddotType = 26101 // 每日一练
//云朵签到
Reddot27101 ReddotType = 27101 // 签到进度
//巨怪商队跑商
Reddot28101 ReddotType = 28101 // 剩余车票
//种族塔
Reddot29101 ReddotType = 29101 // 今日剩余可挑战关卡：x
) )
type TaskType int32 type TaskType int32

9
comm/imodule.go
View File

@ -463,8 +463,6 @@ type (
IPay interface { IPay interface {
//模拟发货 //模拟发货
ModulePayDelivery(session IUserSession, Productid string, Price int32) (errdata *pb.ErrorData) ModulePayDelivery(session IUserSession, Productid string, Price int32) (errdata *pb.ErrorData)
//开启活动
OpenActivity(atype int32, opentime int64)
IActivityNotice IActivityNotice
} }
//支付发货 //支付发货
@ -589,7 +587,6 @@ type (
//战令 //战令
IWarorder interface { IWarorder interface {
Delivery(session IUserSession, pid string) (errdata *pb.ErrorData, items []*pb.UserAssets) Delivery(session IUserSession, pid string) (errdata *pb.ErrorData, items []*pb.UserAssets)
OpenWarorder(wtype int32, opentime int64)
IActivityNotice IActivityNotice
} }
@ -601,6 +598,7 @@ type (
} }
//每日任务 //每日任务
IDailytask interface { IDailytask interface {
IGetReddot
//任务组完成 //任务组完成
TaskGroupComplete(session IUserSession, group int32) TaskGroupComplete(session IUserSession, group int32)
} }
@ -611,4 +609,9 @@ type (
// bingo 关卡 // bingo 关卡
BingoJumpLevel(session IUserSession, level int32) (errdata *pb.ErrorData) BingoJumpLevel(session IUserSession, level int32) (errdata *pb.ErrorData)
} }
//工会boos战
IGuildgve interface {
///红点
IGetReddot
}
) )

23
modules/arena/modelarena.go
View File

@ -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 ( var (
info *pb.DBArenaUser
ticketitem *cfg.Gameatn ticketitem *cfg.Gameatn
err error err error
) )
if info, err = this.queryPlayerInfo(session.GetUserId()); err != nil && err != mgo.MongodbNil { if info, err = this.queryPlayerInfo(session.GetUserId()); err != nil && err != mgo.MongodbNil {
return false activated = false
info = nil
return
} }
if err == mgo.MongodbNil { if err == mgo.MongodbNil {
global := this.module.ModuleTools.GetGlobalConf() global := this.module.ModuleTools.GetGlobalConf()
if global.ArenaTicketMax >= global.ArenaTicketCos.N { 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 { if ticketitem = this.module.ModuleTools.GetGlobalConf().ArenaTicketCos; ticketitem == nil {
this.module.Error("竞技场配置未找到!", log.Field{Key: "key", Value: "ArenaTicketCos"}) 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 { if ticket > this.module.ModuleTools.GetGlobalConf().ArenaTicketCos.N {
return true activated = true
return
} }
return false return
} }

40
modules/arena/module.go
View File

@ -39,12 +39,12 @@ type Arena struct {
modelRank *modelRank modelRank *modelRank
} }
//模块名 // 模块名
func (this *Arena) GetType() core.M_Modules { func (this *Arena) GetType() core.M_Modules {
return comm.ModuleArena return comm.ModuleArena
} }
//模块初始化接口 注册用户创建角色事件 // 模块初始化接口 注册用户创建角色事件
func (this *Arena) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { func (this *Arena) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) {
err = this.ModuleBase.Init(service, module, options) err = this.ModuleBase.Init(service, module, options)
this.service = service.(base.IRPCXService) this.service = service.(base.IRPCXService)
@ -70,7 +70,7 @@ func (this *Arena) Start() (err error) {
return return
} }
//装备组件 // 装备组件
func (this *Arena) OnInstallComp() { func (this *Arena) OnInstallComp() {
this.ModuleBase.OnInstallComp() this.ModuleBase.OnInstallComp()
this.api = this.RegisterComp(new(apiComp)).(*apiComp) this.api = this.RegisterComp(new(apiComp)).(*apiComp)
@ -79,7 +79,7 @@ func (this *Arena) OnInstallComp() {
this.modelRank = this.RegisterComp(new(modelRank)).(*modelRank) this.modelRank = this.RegisterComp(new(modelRank)).(*modelRank)
} }
//比赛结算 // 比赛结算
func (this *Arena) Rpc_ModuleArenaRaceSettlement(ctx context.Context, args *pb.EmptyReq, reply *pb.EmptyResp) (err error) { func (this *Arena) Rpc_ModuleArenaRaceSettlement(ctx context.Context, args *pb.EmptyReq, reply *pb.EmptyResp) (err error) {
this.Debug("Rpc_ModuleArenaRaceSettlement", this.Debug("Rpc_ModuleArenaRaceSettlement",
log.Field{Key: "args", Value: args.String()}, log.Field{Key: "args", Value: args.String()},
@ -88,23 +88,47 @@ func (this *Arena) Rpc_ModuleArenaRaceSettlement(ctx context.Context, args *pb.E
return return
} }
//修改用户积分 // 修改用户积分
func (this *Arena) Rpc_ModuleArenaModifyIntegral(ctx context.Context, args *pb.RPCModifyIntegralReq, reply *pb.EmptyResp) (err error) { 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()}) this.Debug("Rpc_ModuleArenaModifyIntegral", log.Field{Key: "args", Value: args.String()})
err = this.modelArena.modifyIntegral(args.Uid, args.Integral) err = this.modelArena.modifyIntegral(args.Uid, args.Integral)
return return
} }
//红点需求 // 红点需求
func (this *Arena) Reddot(session comm.IUserSession, rid ...comm.ReddotType) (result map[comm.ReddotType]*pb.ReddotItem) { 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) result = make(map[comm.ReddotType]*pb.ReddotItem)
for _, v := range rid { for _, v := range rid {
switch v { 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: case comm.Reddot22102:
result[comm.Reddot22102] = &pb.ReddotItem{ result[comm.Reddot22102] = &pb.ReddotItem{
Rid: int32(comm.Reddot22102), 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 break
} }
} }
@ -128,7 +152,7 @@ func (this *Arena) SetUserIntegral(session comm.IUserSession, Integral int32) (e
return return
} }
///获取竞技场匹配目标战斗阵型数据 // /获取竞技场匹配目标战斗阵型数据
func (this *Arena) GetMatcheBattleRoles(uid string) (captain int32, rules []*pb.BattleRole, err error) { func (this *Arena) GetMatcheBattleRoles(uid string) (captain int32, rules []*pb.BattleRole, err error) {
var ( var (
global *cfg.GameGlobalData global *cfg.GameGlobalData

32
modules/dailytask/module.go
View File

@ -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
}

11
modules/guildgve/modelGuildMember.go
View File

@ -66,12 +66,21 @@ func (this *ModelGuildMember) getGuildMember(guild, uid string) (results *pb.DBG
} }
err = this.Add(uid, results) err = this.Add(uid, results)
} }
if results.Guild != guild { if guild != "" && results.Guild != guild {
results.Guild = guild results.Guild = guild
} }
return 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) { func (this *ModelGuildMember) updateGuildMember(data *pb.DBGuildMember) (err error) {
if err = this.Change(data.Uid, map[string]interface{}{ if err = this.Change(data.Uid, map[string]interface{}{
"guild": data.Guild, "guild": data.Guild,

24
modules/guildgve/module.go
View File

@ -76,3 +76,27 @@ func (this *GuildGve) Rpc_ModuleGuildBossSettlement(ctx context.Context, req *pb
this.modelRank.raceSettlement() this.modelRank.raceSettlement()
return 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
}

26
modules/practice/module.go
View File

@ -407,3 +407,29 @@ func (this *Practice) CleanUpNpc(uid string) {
func (this *Practice) GetAllJxRes() (res []string, err error) { func (this *Practice) GetAllJxRes() (res []string, err error) {
return this.configure.getAllGamePandamasJx() 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
}

16
modules/reddot/api_get.go
View File

@ -5,13 +5,13 @@ import (
"go_dreamfactory/pb" "go_dreamfactory/pb"
) )
//参数校验 // 参数校验
func (this *apiComp) GetCheck(session comm.IUserSession, req *pb.ReddotGetReq) (errdata *pb.ErrorData) { func (this *apiComp) GetCheck(session comm.IUserSession, req *pb.ReddotGetReq) (errdata *pb.ErrorData) {
return return
} }
///获取系统公告 // /获取系统公告
func (this *apiComp) Get(session comm.IUserSession, req *pb.ReddotGetReq) (errdata *pb.ErrorData) { func (this *apiComp) Get(session comm.IUserSession, req *pb.ReddotGetReq) (errdata *pb.ErrorData) {
var ( var (
reddot map[int32]*pb.ReddotItem = make(map[int32]*pb.ReddotItem) 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 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) { for k, v := range this.module.ModuleSociaty.Reddot(session, _rid) {
reddot[int32(k)] = v 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) { for k, v := range this.module.library.Reddot(session, _rid) {
reddot[int32(k)] = v 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: case comm.Reddot17:
for k, v := range this.module.horoscope.Reddot(session, _rid) { for k, v := range this.module.horoscope.Reddot(session, _rid) {
reddot[int32(k)] = v reddot[int32(k)] = v

20
modules/reddot/module.go
View File

@ -28,22 +28,24 @@ type Reddot struct {
sociaty comm.ISociaty //工会 sociaty comm.ISociaty //工会
pagoda comm.IPagoda pagoda comm.IPagoda
horoscope comm.IHoroscope horoscope comm.IHoroscope
arena comm.IArena //竞技场 arena comm.IArena //竞技场
dailytask comm.IDailytask //每日任务
friend comm.IFriend friend comm.IFriend
gourmet comm.IGourmet gourmet comm.IGourmet
viking comm.IViking viking comm.IViking
hunting comm.IHunting hunting comm.IHunting
guildgve comm.IGuildgve //工会boos战
api_comp *apiComp api_comp *apiComp
mline comm.IMline mline comm.IMline
} }
//模块名 // 模块名
func (this *Reddot) GetType() core.M_Modules { func (this *Reddot) GetType() core.M_Modules {
return comm.ModuleReddot return comm.ModuleReddot
} }
//模块初始化接口 注册用户创建角色事件 // 模块初始化接口 注册用户创建角色事件
func (this *Reddot) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { func (this *Reddot) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) {
err = this.ModuleBase.Init(service, module, options) err = this.ModuleBase.Init(service, module, options)
this.service = service.(base.IRPCXService) this.service = service.(base.IRPCXService)
@ -107,16 +109,24 @@ func (this *Reddot) Start() (err error) {
} }
this.library = module.(comm.ILibrary) 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 return
} }
//装备组件 // 装备组件
func (this *Reddot) OnInstallComp() { func (this *Reddot) OnInstallComp() {
this.ModuleBase.OnInstallComp() this.ModuleBase.OnInstallComp()
this.api_comp = this.RegisterComp(new(apiComp)).(*apiComp) this.api_comp = this.RegisterComp(new(apiComp)).(*apiComp)
} }
//推送红点 // 推送红点
func (this *Reddot) PushReddot(session comm.IUserSession, reddot ...*pb.ReddotItem) (errdata *pb.ErrorData) { func (this *Reddot) PushReddot(session comm.IUserSession, reddot ...*pb.ReddotItem) (errdata *pb.ErrorData) {
if len(reddot) <= 0 { if len(reddot) <= 0 {
return return

59
modules/sociaty/module.go
View File

@ -178,40 +178,39 @@ func (this *Sociaty) Reddot(session comm.IUserSession, rid ...comm.ReddotType) (
reddot = make(map[comm.ReddotType]*pb.ReddotItem) reddot = make(map[comm.ReddotType]*pb.ReddotItem)
sociaty := this.modelSociaty.getUserSociaty(session.GetUserId()) sociaty := this.modelSociaty.getUserSociaty(session.GetUserId())
if sociaty == nil || sociaty.Id == "" { if sociaty == nil || sociaty.Id == "" {
for _, v := range rid { return
reddot[v] = &pb.ReddotItem{ }
Rid: int32(v), var applyReddot bool
Activated: false, if this.modelSociaty.isRight(session.GetUserId(), sociaty,
Nextchanagetime: 0, pb.SociatyJob_PRESIDENT,
} pb.SociatyJob_VICEPRESIDENT,
} pb.SociatyJob_ADMIN) {
} else {
var applyReddot bool
if this.modelSociaty.isRight(session.GetUserId(), sociaty,
pb.SociatyJob_PRESIDENT,
pb.SociatyJob_VICEPRESIDENT,
pb.SociatyJob_ADMIN) {
if len(sociaty.ApplyRecord) > 0 { if len(sociaty.ApplyRecord) > 0 {
applyReddot = true applyReddot = true
}
} }
for _, v := range rid { }
switch v { for _, v := range rid {
case comm.Reddot15102: switch v {
tf := this.modelSociaty.IsSign(session.GetUserId(), sociaty) case comm.Reddot15102:
reddot[comm.Reddot15102] = progress := int32(0)
&pb.ReddotItem{ tf := this.modelSociaty.IsSign(session.GetUserId(), sociaty)
Rid: int32(comm.Reddot15102), if tf {
Activated: !tf, progress = 1
Nextchanagetime: 0, }
} reddot[comm.Reddot15102] =
case comm.Reddot15201: &pb.ReddotItem{
reddot[comm.Reddot15201] = &pb.ReddotItem{ Rid: int32(comm.Reddot15102),
Rid: int32(comm.Reddot15201), Activated: !tf,
Activated: applyReddot,
Nextchanagetime: 0, Nextchanagetime: 0,
Progress: progress,
Total: 1,
} }
case comm.Reddot15201:
reddot[comm.Reddot15201] = &pb.ReddotItem{
Rid: int32(comm.Reddot15201),
Activated: applyReddot,
Nextchanagetime: 0,
} }
} }
} }

86
pb/reddot_msg.pb.go
View File

@ -28,6 +28,8 @@ type ReddotItem struct {
Rid int32 `protobuf:"varint,1,opt,name=rid,proto3" json:"rid"` //红点id Rid int32 `protobuf:"varint,1,opt,name=rid,proto3" json:"rid"` //红点id
Activated bool `protobuf:"varint,2,opt,name=activated,proto3" json:"activated"` //是否激活 Activated bool `protobuf:"varint,2,opt,name=activated,proto3" json:"activated"` //是否激活
Nextchanagetime int64 `protobuf:"varint,3,opt,name=nextchanagetime,proto3" json:"nextchanagetime"` //下次变化时间 为0 不处理 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() { func (x *ReddotItem) Reset() {
@ -83,6 +85,20 @@ func (x *ReddotItem) GetNextchanagetime() int64 {
return 0 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 { type ReddotGetAllReq struct {
state protoimpl.MessageState state protoimpl.MessageState
@ -316,39 +332,43 @@ var File_reddot_reddot_msg_proto protoreflect.FileDescriptor
var file_reddot_reddot_msg_proto_rawDesc = []byte{ var file_reddot_reddot_msg_proto_rawDesc = []byte{
0x0a, 0x17, 0x72, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x2f, 0x72, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x5f, 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, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x98, 0x01, 0x0a, 0x0a, 0x52, 0x65,
0x64, 0x6f, 0x74, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x64, 0x64, 0x6f, 0x74, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18,
0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x63, 0x74, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x63,
0x69, 0x76, 0x61, 0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x61,
0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x64, 0x12, 0x28, 0x0a, 0x0f, 0x6e, 0x65, 0x78, 0x74, 0x63, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x64, 0x12, 0x28, 0x0a, 0x0f, 0x6e, 0x65, 0x78, 0x74,
0x68, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x63, 0x68, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
0x52, 0x0f, 0x6e, 0x65, 0x78, 0x74, 0x63, 0x68, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x74, 0x69, 0x6d, 0x03, 0x52, 0x0f, 0x6e, 0x65, 0x78, 0x74, 0x63, 0x68, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x74, 0x69,
0x65, 0x22, 0x11, 0x0a, 0x0f, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x18, 0x04,
0x6c, 0x52, 0x65, 0x71, 0x22, 0x91, 0x01, 0x0a, 0x10, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x47, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x12, 0x14,
0x65, 0x74, 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x35, 0x0a, 0x06, 0x72, 0x65, 0x64, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74,
0x64, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x61, 0x6c, 0x22, 0x11, 0x0a, 0x0f, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x47, 0x65,
0x6f, 0x74, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x52, 0x65, 0x64, 0x74, 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x71, 0x22, 0x91, 0x01, 0x0a, 0x10, 0x52, 0x65, 0x64, 0x64,
0x64, 0x6f, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x6f, 0x74, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x35, 0x0a, 0x06,
0x1a, 0x46, 0x0a, 0x0b, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x72, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x52,
0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x2e,
0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x65, 0x64,
0x32, 0x0b, 0x2e, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x76, 0x64, 0x6f, 0x74, 0x1a, 0x46, 0x0a, 0x0b, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x45, 0x6e, 0x74,
0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x22, 0x0a, 0x0c, 0x52, 0x65, 0x64, 0x64, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
0x6f, 0x74, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x69, 0x64, 0x73, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x04, 0x72, 0x69, 0x64, 0x73, 0x22, 0x8b, 0x01, 0x0a, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x49, 0x74, 0x65, 0x6d,
0x0d, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x47, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x32, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x22, 0x0a, 0x0c, 0x52,
0x0a, 0x06, 0x72, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x72,
0x2e, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x47, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x52, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x04, 0x72, 0x69, 0x64, 0x73, 0x22,
0x65, 0x64, 0x64, 0x6f, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x65, 0x64, 0x64, 0x8b, 0x01, 0x0a, 0x0d, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x47, 0x65, 0x74, 0x52, 0x65, 0x73,
0x6f, 0x74, 0x1a, 0x46, 0x0a, 0x0b, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x70, 0x12, 0x32, 0x0a, 0x06, 0x72, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28,
0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x0b, 0x32, 0x1a, 0x2e, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x47, 0x65, 0x74, 0x52, 0x65, 0x73,
0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x70, 0x2e, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72,
0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x1a, 0x46, 0x0a, 0x0b, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x45,
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x33, 0x0a, 0x10, 0x52, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
0x64, 0x64, 0x6f, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1f, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
0x0a, 0x04, 0x72, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x52, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x52, 0x65, 0x64, 0x64, 0x6f, 0x74, 0x49, 0x74,
0x65, 0x64, 0x64, 0x6f, 0x74, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x04, 0x72, 0x69, 0x64, 0x73, 0x42, 0x65, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x33, 0x0a,
0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 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 ( var (