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:
liwei1dao 2023-12-07 16:16:51 +08:00
commit 91a925e04f
23 changed files with 2943 additions and 2792 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
bin/json/game_askedrecruit.json
View File

@ -90,7 +90,7 @@
"talkPoint": 1,
"storyText": {
"key": "drawcard_asked_storyText_6",
"text": "黑暗终将吞没一切"
"text": "黑暗终将吞没一切，唯有传承能指引前行。"
},
"optionText1": {
"key": "",
@ -103,79 +103,28 @@
},
{
"key": 6,
"type": 0,
"talkPoint": 2,
"type": 1,
"talkPoint": 0,
"storyText": {
"key": "drawcard_asked_storyText_7",
"text": "只留一线生机……"
"text": "你将带领守护者们，见证终局……"
},
"optionText1": {
"key": "",
"text": ""
"key": "drawcard_asked_optionText1_8",
"text": "有点强人所难。"
},
"optionText2": {
"key": "",
"text": ""
"key": "drawcard_asked_optionText9",
"text": "我要全图鉴！"
}
},
{
"key": 7,
"type": 1,
"talkPoint": 0,
"storyText": {
"key": "drawcard_asked_storyText_8",
"text": "你来见证终局，还是来博取这一线生机？"
},
"optionText1": {
"key": "drawcard_asked_optionText1_8",
"text": "只能二选一吗？"
},
"optionText2": {
"key": "drawcard_asked_optionText9",
"text": "我来过新手教程"
}
},
{
"key": 8,
"type": 0,
"talkPoint": 0,
"storyText": {
"key": "drawcard_asked_storyText_9",
"text": "有趣！有趣！"
},
"optionText1": {
"key": "",
"text": ""
},
"optionText2": {
"key": "",
"text": ""
}
},
{
"key": 9,
"type": 0,
"talkPoint": 0,
"storyText": {
"key": "drawcard_asked_storyText_10",
"text": "感受此时的心境，年轻人。"
},
"optionText1": {
"key": "",
"text": ""
},
"optionText2": {
"key": "",
"text": ""
}
},
{
"key": 10,
"type": 0,
"talkPoint": 0,
"storyText": {
"key": "drawcard_asked_storyText_11",
"text": "循着自己的内心，接受他的指引吧……"
"text": "来，召唤属于你的英雄！"
},
"optionText1": {
"key": "",

16
bin/json/game_catchbugreward.json
View File

@ -138,7 +138,7 @@
{
"key": 2001,
"type": 2,
"condition": 15,
"condition": 1,
"reward": [
{
"a": "item",
@ -155,7 +155,7 @@
{
"key": 2002,
"type": 2,
"condition": 20,
"condition": 2,
"reward": [
{
"a": "item",
@ -172,7 +172,7 @@
{
"key": 2003,
"type": 2,
"condition": 25,
"condition": 3,
"reward": [
{
"a": "item",
@ -189,7 +189,7 @@
{
"key": 2004,
"type": 2,
"condition": 30,
"condition": 4,
"reward": [
{
"a": "item",
@ -206,7 +206,7 @@
{
"key": 2005,
"type": 2,
"condition": 35,
"condition": 5,
"reward": [
{
"a": "item",
@ -223,7 +223,7 @@
{
"key": 2006,
"type": 2,
"condition": 40,
"condition": 6,
"reward": [
{
"a": "item",
@ -240,7 +240,7 @@
{
"key": 2007,
"type": 2,
"condition": 45,
"condition": 7,
"reward": [
{
"a": "item",
@ -257,7 +257,7 @@
{
"key": 2008,
"type": 2,
"condition": 50,
"condition": 8,
"reward": [
{
"a": "item",

2
bin/json/game_drawpool.json
View File

@ -21,7 +21,7 @@
{
"a": "item",
"t": "10000001",
"n": 1
"n": 10
}
],
"consumeB": [],

89
bin/json/game_drawreplace.json
View File

@ -2,8 +2,8 @@
{
"id": 1,
"pool": 1,
"hero_initial": "25001",
"hero_replace": "15002",
"hero_initial": "15004",
"hero_replace": "15004",
"replace_cd": 0,
"replace_num": 0,
"buy_cos": {
@ -15,8 +15,8 @@
{
"id": 2,
"pool": 1,
"hero_initial": "25001",
"hero_replace": "15004",
"hero_initial": "15004",
"hero_replace": "15002",
"replace_cd": 0,
"replace_num": 0,
"buy_cos": {
@ -28,8 +28,8 @@
{
"id": 3,
"pool": 1,
"hero_initial": "25001",
"hero_replace": "25001",
"hero_initial": "15004",
"hero_replace": "25004",
"replace_cd": 0,
"replace_num": 0,
"buy_cos": {
@ -41,20 +41,7 @@
{
"id": 4,
"pool": 1,
"hero_initial": "25001",
"hero_replace": "25004",
"replace_cd": 0,
"replace_num": 0,
"buy_cos": {
"a": "item",
"t": "10000101",
"n": 150
}
},
{
"id": 5,
"pool": 1,
"hero_initial": "25001",
"hero_initial": "15004",
"hero_replace": "35004",
"replace_cd": 0,
"replace_num": 0,
@ -65,9 +52,9 @@
}
},
{
"id": 6,
"id": 5,
"pool": 1,
"hero_initial": "25001",
"hero_initial": "15004",
"hero_replace": "35005",
"replace_cd": 0,
"replace_num": 0,
@ -78,7 +65,7 @@
}
},
{
"id": 7,
"id": 6,
"pool": 2,
"hero_initial": "15002",
"hero_replace": "15002",
@ -90,36 +77,23 @@
"n": 150
}
},
{
"id": 7,
"pool": 2,
"hero_initial": "15002",
"hero_replace": "15004",
"replace_cd": 5184000,
"replace_num": 0,
"buy_cos": {
"a": "item",
"t": "10000101",
"n": 150
}
},
{
"id": 8,
"pool": 2,
"hero_initial": "15002",
"hero_replace": "15004",
"replace_cd": 5184000,
"replace_num": 0,
"buy_cos": {
"a": "item",
"t": "10000101",
"n": 150
}
},
{
"id": 9,
"pool": 2,
"hero_initial": "15002",
"hero_replace": "25001",
"replace_cd": 5184000,
"replace_num": 300,
"buy_cos": {
"a": "item",
"t": "10000101",
"n": 150
}
},
{
"id": 10,
"pool": 2,
"hero_initial": "15002",
"hero_replace": "25004",
"replace_cd": 5184000,
"replace_num": 300,
@ -130,10 +104,10 @@
}
},
{
"id": 11,
"id": 9,
"pool": 2,
"hero_initial": "15002",
"hero_replace": "35004",
"hero_replace": "35005",
"replace_cd": 5184000,
"replace_num": 400,
"buy_cos": {
@ -141,18 +115,5 @@
"t": "10000101",
"n": 180
}
},
{
"id": 12,
"pool": 2,
"hero_initial": "15002",
"hero_replace": "35005",
"replace_cd": 5184000,
"replace_num": 600,
"buy_cos": {
"a": "item",
"t": "10000101",
"n": 180
}
}
]

24
bin/json/game_integralcondition.json
View File

@ -2,6 +2,8 @@
{
"id": 1001,
"condition": "完成主线任务：寻找龙之花",
"TaskId": 16000013,
"iType": 1,
"condval": "",
"jumpto": 166,
"des": "[敌方]暴击伤害降低10%",
@ -10,6 +12,8 @@
{
"id": 1002,
"condition": "完成主线任务：神奇的原住人",
"TaskId": 16000016,
"iType": 1,
"condval": "",
"jumpto": 166,
"des": "[敌方]防御降低10%",
@ -18,6 +22,8 @@
{
"id": 1003,
"condition": "传承者达到20级",
"TaskId": 16000017,
"iType": 1,
"condval": "20",
"jumpto": 0,
"des": "[敌方]攻击降低10%",
@ -26,6 +32,8 @@
{
"id": 1004,
"condition": "累计完成5个日常任务",
"TaskId": 16000019,
"iType": 1,
"condval": "30",
"jumpto": 0,
"des": "[敌方]速度降低10点",
@ -34,6 +42,8 @@
{
"id": 1005,
"condition": "累计召唤20次守护者",
"TaskId": 16000020,
"iType": 1,
"condval": "40",
"jumpto": 0,
"des": "[敌方]命中降低10%",
@ -42,6 +52,8 @@
{
"id": 1006,
"condition": "累计在商店购买5次商品",
"TaskId": 16000021,
"iType": 1,
"condval": "50",
"jumpto": 0,
"des": "[敌方]暴击降低10%",
@ -50,6 +62,8 @@
{
"id": 1007,
"condition": "进行10次竞技挑战",
"TaskId": 16000022,
"iType": 1,
"condval": "60",
"jumpto": 0,
"des": "[敌方]受到增益效果降低30%",
@ -58,6 +72,8 @@
{
"id": 1008,
"condition": "完成1次捕羊大赛",
"TaskId": 16000023,
"iType": 1,
"condval": "5",
"jumpto": 0,
"des": "[敌方]所有减益效果持续回合数+1",
@ -66,6 +82,8 @@
{
"id": 1009,
"condition": "辉月等级达到3级",
"TaskId": 16000024,
"iType": 1,
"condval": "80",
"jumpto": 0,
"des": "[敌方]受到持续伤害增加50%",
@ -74,6 +92,8 @@
{
"id": 1010,
"condition": "累计完成3次每日一练",
"TaskId": 16000025,
"iType": 1,
"condval": "100",
"jumpto": 0,
"des": "[敌方]无法触发强击",
@ -82,6 +102,8 @@
{
"id": 1011,
"condition": "上阵2个属性为感官之林的继承者",
"TaskId": 0,
"iType": 2,
"condval": "2,2",
"jumpto": 0,
"des": "[敌方]3技能最大回合数+1",
@ -90,6 +112,8 @@
{
"id": 1012,
"condition": "上阵1名攻击型守护者",
"TaskId": 0,
"iType": 2,
"condval": "1,1",
"jumpto": 0,
"des": "[敌方]开战后，减少2个被动效果",

432
bin/json/game_loading.json
View File

@ -1,7 +1,7 @@
[
{
"id": 1001,
"scene": "GameMain",
"subScene": "",
"image": "ld_mh_bg_zc02",
"icon": "loading_icon_fc",
"title": {
@ -14,8 +14,8 @@
}
},
{
"id": 1002,
"scene": "CommandScene",
"subScene": "",
"image": "ld_mh_bg_zhb",
"icon": "loading_icon_zhb",
"title": {
@ -28,8 +28,8 @@
}
},
{
"id": 1003,
"scene": "WuGuanScene",
"subScene": "",
"image": "ld_mh_bg_wg",
"icon": "loading_icon_gfxm",
"title": {
@ -42,8 +42,8 @@
}
},
{
"id": 1004,
"scene": "SmithyScene",
"subScene": "",
"image": "ld_mh_bg_tjp",
"icon": "loading_icon_xlgs",
"title": {
@ -56,8 +56,8 @@
}
},
{
"id": 1005,
"scene": "ParkourScene",
"subScene": "",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_gfxm",
"title": {
@ -70,8 +70,8 @@
}
},
{
"id": 1006,
"scene": "GuildScene",
"subScene": "",
"image": "ld_mh_gh",
"icon": "loading_icon_gh",
"title": {
@ -84,8 +84,8 @@
}
},
{
"id": 1007,
"scene": "ArenaScene",
"subScene": "",
"image": "ld_boss_bg",
"icon": "loading_icon_gfxm",
"title": {
@ -98,8 +98,8 @@
}
},
{
"id": 1008,
"scene": "businessScene",
"subScene": "",
"image": "ld_mh_bg_sd",
"icon": "loading_icon_jgsd",
"title": {
@ -112,8 +112,8 @@
}
},
{
"id": 1009,
"scene": "DrawCardScene",
"subScene": "",
"image": "loading_2",
"icon": "loading_icon_gfxm",
"title": {
@ -126,8 +126,8 @@
}
},
{
"id": 1010,
"scene": "CombatLevelScene",
"subScene": "",
"image": "ld_5v5_bg1",
"icon": "loading_icon_gfxm",
"title": {
@ -140,22 +140,8 @@
}
},
{
"id": 1011,
"scene": "MainLineScene",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_11",
"text": "「博克岛」"
},
"prompt": {
"key": "loading_Sheet1_prompt_11",
"text": "这里是博克岛。</br>一般来说，这个板块会介绍气候、风土、民俗什么的；但提起博克岛，你需要知道的只有——龙！"
}
},
{
"id": 1012,
"scene": "scenesfight_06",
"subScene": "",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
@ -168,8 +154,8 @@
}
},
{
"id": 1013,
"scene": "scenesfight_05_01",
"subScene": "",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
@ -182,8 +168,8 @@
}
},
{
"id": 1014,
"scene": "scenesfight_07",
"subScene": "",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
@ -196,8 +182,8 @@
}
},
{
"id": 1015,
"scene": "bossfight_naturetitan_01",
"subScene": "",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
@ -210,8 +196,8 @@
}
},
{
"id": 1016,
"scene": "bossfight_spinymandrilla_02",
"subScene": "",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
@ -224,8 +210,8 @@
}
},
{
"id": 1017,
"scene": "GameFightScene",
"subScene": "",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
@ -238,22 +224,8 @@
}
},
{
"id": 1018,
"scene": "GuildScene",
"image": "ld_mh_gh",
"icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_18",
"text": "「公会」"
},
"prompt": {
"key": "loading_Sheet1_prompt_18",
"text": "俱乐部是大家一起快乐玩耍的好地方。"
}
},
{
"id": 1019,
"scene": "GameMain",
"scene": "GameFightScene",
"subScene": "1019",
"image": "ld_mh_bg01",
"icon": "loading_icon_gfxm",
"title": {
@ -266,162 +238,8 @@
}
},
{
"id": 1020,
"scene": "MainLineScene",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_20",
"text": "「主线第2章」"
},
"prompt": {
"key": "loading_Sheet1_prompt_20",
"text": "想学会功夫，必须要先相信。相信自我，相信爱，相信它们一直都在。"
}
},
{
"id": 1021,
"scene": "MainLineScene",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_21",
"text": "「主线第3章」"
},
"prompt": {
"key": "loading_Sheet1_prompt_21",
"text": "当尾巴开始不由自主地摆动，便代表一颗善心开始苏醒。"
}
},
{
"id": 1022,
"scene": "MainLineScene",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_22",
"text": "「主线第4章」"
},
"prompt": {
"key": "loading_Sheet1_prompt_22",
"text": "许多人爱慕美丽的容颜，而我独爱虔诚善良的心。"
}
},
{
"id": 1023,
"scene": "MainLineScene",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_23",
"text": "「主线第5章」"
},
"prompt": {
"key": "loading_Sheet1_prompt_23",
"text": "山有猛龙，狂嗅薄荷。何意万龙王，化为绕指柔。"
}
},
{
"id": 1024,
"scene": "MainLineScene",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_24",
"text": "「主线第6章」"
},
"prompt": {
"key": "loading_Sheet1_prompt_24",
"text": "天性是不可被束缚的，再幼小的身躯也能爆发出惊人的力量。"
}
},
{
"id": 1025,
"scene": "MainLineScene",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_25",
"text": "「主线第7章」"
},
"prompt": {
"key": "loading_Sheet1_prompt_25",
"text": "我们是魔发精灵，会唱歌，会跳舞，散播欢乐和爱。"
}
},
{
"id": 1026,
"scene": "MainLineScene",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_26",
"text": "「主线第8章」"
},
"prompt": {
"key": "loading_Sheet1_prompt_26",
"text": "很多人并不是我们想象中的那副样子，重要的是，试着多了解对方。"
}
},
{
"id": 1027,
"scene": "MainLineScene",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_27",
"text": "「主线第9章」"
},
"prompt": {
"key": "loading_Sheet1_prompt_27",
"text": "尽管我们互看不顺眼，总是吵吵闹闹，我还是愿意把所有的爱给你。"
}
},
{
"id": 1028,
"scene": "MainLineScene",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_28",
"text": "「主线第10章」"
},
"prompt": {
"key": "loading_Sheet1_prompt_28",
"text": "即使有95%的几率会完蛋，也不能放弃5%的奇遇和辉煌。"
}
},
{
"id": 1029,
"scene": "MainLineScene",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_29",
"text": "「主线第11章」"
},
"prompt": {
"key": "loading_Sheet1_prompt_29",
"text": "我们已经拯救过世界无数次，这次也是。"
}
},
{
"id": 1030,
"scene": "MainLineScene",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_30",
"text": "「主线第12章」"
},
"prompt": {
"key": "loading_Sheet1_prompt_30",
"text": "守护与被守护，永远是相互的。"
}
},
{
"id": 1031,
"scene": "scenesfight_09",
"scene": "GameFightScene",
"subScene": "1031",
"image": "ld_mh_bg_tjp",
"icon": "loading_icon_fc",
"title": {
@ -434,22 +252,8 @@
}
},
{
"id": 1032,
"scene": "LoginScene",
"image": "ld_mh_bg_zc02",
"icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_32",
"text": "「中轴城」"
},
"prompt": {
"key": "loading_Sheet1_prompt_32",
"text": "终极之战后，月中人陷入沉睡，为了更好地守护月之大陆，守护者们把力量集中起来，建立了中轴城。</br>这是一座用火球煮咖啡，用扫描仪复制魔法卷轴的神奇城市，坐落于月之大陆的中心，是世界文明交流的枢纽。"
}
},
{
"id": 1033,
"scene": "GameMain",
"scene": "GameFightScene",
"subScene": "1033",
"image": "ld_mh_bg01",
"icon": "loading_icon_gfxm",
"title": {
@ -462,8 +266,190 @@
}
},
{
"id": 1034,
"scene": "MainLineScene",
"subScene": "11001",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_11",
"text": "「博克岛」"
},
"prompt": {
"key": "loading_Sheet1_prompt_11",
"text": "这里是博克岛。</br>一般来说，这个板块会介绍气候、风土、民俗什么的；但提起博克岛，你需要知道的只有——龙！"
}
},
{
"scene": "MainLineScene",
"subScene": "11002",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_20",
"text": "「主线第2章」"
},
"prompt": {
"key": "loading_Sheet1_prompt_20",
"text": "想学会功夫，必须要先相信。相信自我，相信爱，相信它们一直都在。"
}
},
{
"scene": "MainLineScene",
"subScene": "11003",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_21",
"text": "「主线第3章」"
},
"prompt": {
"key": "loading_Sheet1_prompt_21",
"text": "当尾巴开始不由自主地摆动，便代表一颗善心开始苏醒。"
}
},
{
"scene": "MainLineScene",
"subScene": "11004",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_22",
"text": "「主线第4章」"
},
"prompt": {
"key": "loading_Sheet1_prompt_22",
"text": "许多人爱慕美丽的容颜，而我独爱虔诚善良的心。"
}
},
{
"scene": "MainLineScene",
"subScene": "11005",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_23",
"text": "「主线第5章」"
},
"prompt": {
"key": "loading_Sheet1_prompt_23",
"text": "山有猛龙，狂嗅薄荷。何意万龙王，化为绕指柔。"
}
},
{
"scene": "MainLineScene",
"subScene": "11006",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_24",
"text": "「主线第6章」"
},
"prompt": {
"key": "loading_Sheet1_prompt_24",
"text": "天性是不可被束缚的，再幼小的身躯也能爆发出惊人的力量。"
}
},
{
"scene": "MainLineScene",
"subScene": "11007",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_25",
"text": "「主线第7章」"
},
"prompt": {
"key": "loading_Sheet1_prompt_25",
"text": "我们是魔发精灵，会唱歌，会跳舞，散播欢乐和爱。"
}
},
{
"scene": "MainLineScene",
"subScene": "11008",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_26",
"text": "「主线第8章」"
},
"prompt": {
"key": "loading_Sheet1_prompt_26",
"text": "很多人并不是我们想象中的那副样子，重要的是，试着多了解对方。"
}
},
{
"scene": "MainLineScene",
"subScene": "11009",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_27",
"text": "「主线第9章」"
},
"prompt": {
"key": "loading_Sheet1_prompt_27",
"text": "尽管我们互看不顺眼，总是吵吵闹闹，我还是愿意把所有的爱给你。"
}
},
{
"scene": "MainLineScene",
"subScene": "11010",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_28",
"text": "「主线第10章」"
},
"prompt": {
"key": "loading_Sheet1_prompt_28",
"text": "即使有95%的几率会完蛋，也不能放弃5%的奇遇和辉煌。"
}
},
{
"scene": "MainLineScene",
"subScene": "11011",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_29",
"text": "「主线第11章」"
},
"prompt": {
"key": "loading_Sheet1_prompt_29",
"text": "我们已经拯救过世界无数次，这次也是。"
}
},
{
"scene": "MainLineScene",
"subScene": "11012",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_30",
"text": "「主线第12章」"
},
"prompt": {
"key": "loading_Sheet1_prompt_30",
"text": "守护与被守护，永远是相互的。"
}
},
{
"scene": "LoginScene",
"subScene": "",
"image": "ld_mh_bg_zc02",
"icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_32",
"text": "「中轴城」"
},
"prompt": {
"key": "loading_Sheet1_prompt_32",
"text": "终极之战后，月中人陷入沉睡，为了更好地守护月之大陆，守护者们把力量集中起来，建立了中轴城。</br>这是一座用火球煮咖啡，用扫描仪复制魔法卷轴的神奇城市，坐落于月之大陆的中心，是世界文明交流的枢纽。"
}
},
{
"scene": "CaravanScene",
"subScene": "",
"image": "ld_mh_bg_sd",
"icon": "loading_icon_jgsd",
"title": {
@ -476,8 +462,8 @@
}
},
{
"id": 1035,
"scene": "StonehengeScene1",
"subScene": "",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
@ -490,8 +476,8 @@
}
},
{
"id": 1036,
"scene": "StonehengeScene2",
"subScene": "",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
@ -504,8 +490,8 @@
}
},
{
"id": 1037,
"scene": "StonehengeScene3",
"subScene": "",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
@ -518,8 +504,8 @@
}
},
{
"id": 1038,
"scene": "StonehengeScene4",
"subScene": "",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {

14
bin/json/game_monsterformat.json
View File

@ -233814,7 +233814,7 @@
"lv": 2,
"hppro": 0.6,
"atkpro": 0.5,
"defpro": 0.5,
"defpro": 1,
"skill1": 1,
"skill2": 1,
"skill3": 1,
@ -233832,9 +233832,9 @@
"equip": [],
"newskill": [],
"lv": 2,
"hppro": 0.6,
"hppro": 0.5,
"atkpro": 0.5,
"defpro": 0.5,
"defpro": 1,
"skill1": 1,
"skill2": 1,
"skill3": 1,
@ -233852,9 +233852,9 @@
"equip": [],
"newskill": [],
"lv": 2,
"hppro": 0.6,
"hppro": 0.5,
"atkpro": 0.5,
"defpro": 0.5,
"defpro": 1,
"skill1": 1,
"skill2": 1,
"skill3": 1,
@ -233874,7 +233874,7 @@
"lv": 2,
"hppro": 0.6,
"atkpro": 0.5,
"defpro": 0.5,
"defpro": 0.1,
"skill1": 1,
"skill2": 1,
"skill3": 1,
@ -233894,7 +233894,7 @@
"lv": 2,
"hppro": 0.6,
"atkpro": 0.5,
"defpro": 0.5,
"defpro": 0.1,
"skill1": 1,
"skill2": 1,
"skill3": 1,

4572
bin/json/game_skillatk.json
View File

File diff suppressed because it is too large Load Diff

3
comm/imodule.go
View File

@ -319,6 +319,9 @@ type (
CheckBattleReport(session IUserSession, report *pb.BattleReport) (errdata *pb.ErrorData, iswin bool)
///创建石阵秘境战斗
CreateStoneBattle(session IUserSession, stoneBattle *pb.StroneBattleReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord)
// 可以携带debuff 的战斗
//CreateDebuffBattle(session IUserSession, req *pb.BattlePVEReq, webuff []int32, dibuff []int32) (errdata *pb.ErrorData, record *pb.DBBattleRecord)
}
IGm interface {
CreateCmd(session IUserSession, cmd string) (errdata *pb.ErrorData)

3
modules/integral/api_challenge.go
View File

@ -50,9 +50,10 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.IntegralChalle
}
return
}
errdata, record := this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
Rulesid: cfgData.BattleReadyID,
Ptype: pb.PlayType_enchant,
Ptype: pb.PlayType_integral,
Title: "",
Format: req.Battle,
Mformat: cfgData.Boss,

88
modules/integral/api_reward.go Normal file
View File

@ -0,0 +1,88 @@
package integral
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
)
//参数校验
func (this *apiComp) GetRewardCheck(session comm.IUserSession, req *pb.IntegralGetRewardReq) (errdata *pb.ErrorData) {
if req.Itype != 1 && req.Itype != 2 {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
}
}
return
}
func (this *apiComp) GetReward(session comm.IUserSession, req *pb.IntegralGetRewardReq) (errdata *pb.ErrorData) {
var (
list *pb.DBIntegralBoss
err error
conf []*cfg.GameIntegralRewardData
res []*cfg.Gameatn
atno []*pb.UserAtno
)
update := make(map[string]interface{})
list, err = this.module.modelIntegral.getIntegralList(session.GetUserId())
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
}
return
}
if conf, err = this.module.configure.GetIntegralReward(list.Hid, req.Itype); err != nil { // 配置校验
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
for _, v := range conf {
if req.Itype == 1 {
if list.Reward1 < v.Val && list.Maxscore > int64(v.Val) {
res = append(res, v.Prize...)
list.Reward1 = v.Val
}
} else {
if list.Reward2 < v.Val && list.Totalscore > int64(v.Val) {
res = append(res, v.Prize...)
list.Reward2 = v.Val
}
}
}
if len(res) > 0 {
update["reward1"] = list.Reward1
update["reward2"] = list.Reward2
if errdata, atno = this.module.DispenseAtno(session, res, true); errdata != nil {
return
}
if err = this.module.modelIntegral.modifyIntegralData(session.GetUserId(), update); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
} else {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_UserNoReward,
Title: pb.ErrorCode_UserNoReward.ToString(),
}
return
}
session.SendMsg(string(this.module.GetType()), "getreward", &pb.IntegralGetRewardResp{
Data: list,
Award: atno,
})
return
}

95
modules/integral/comp_configure.go
View File

@ -2,6 +2,7 @@ package integral
import (
"fmt"
"go_dreamfactory/comm"
"go_dreamfactory/lego/core"
"go_dreamfactory/lego/sys/log"
"go_dreamfactory/modules"
@ -21,16 +22,23 @@ const (
type configureComp struct {
hlock sync.RWMutex
modules.MCompConfigure
boss map[int32]*cfg.GameIntegralBossData
module *Integral
boss map[int32]*cfg.GameIntegralBossData
reward map[int32][]*cfg.GameIntegralRewardData
task map[int32]*cfg.GameIntegralConditionData
}
//组件初始化接口
func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
err = this.MCompConfigure.Init(service, module, comp, options)
this.module = module.(*Integral)
err = this.LoadMultiConfigure(map[string]interface{}{
game_integraltime: cfg.NewGameIntegralTime,
game_integraltime: cfg.NewGameIntegralTime,
game_integralcondition: cfg.NewGameIntegralCondition,
})
configure.RegisterConfigure(game_integralboss, cfg.NewGameIntegralBoss, this.LoadStageBoss)
configure.RegisterConfigure(game_integralreward, cfg.NewGameIntegralReward, this.LoadIntegralReward)
configure.RegisterConfigure(game_integraltime, cfg.NewGameIntegralCondition, this.LoadIntegralCondition)
return
}
@ -98,3 +106,86 @@ func (this *configureComp) GetIntegralITime() (sz []*cfg.GameIntegralTimeData) {
return
}
func (this *configureComp) LoadIntegralReward() {
if v, err := this.GetConfigure(game_integralreward); err == nil {
this.hlock.Lock()
defer this.hlock.Unlock()
this.reward = make(map[int32][]*cfg.GameIntegralRewardData)
if _configure, ok := v.(*cfg.GameIntegralReward); ok {
for _, v := range _configure.GetDataList() {
key := v.Hdid<<8 + v.Type
this.reward[key] = append(this.reward[key], v)
}
return
}
} else {
err = fmt.Errorf("%T no is *cfg.GameMonkeyReward", v)
}
}
func (this *configureComp) GetIntegralReward(hid int32, itype int32) (result []*cfg.GameIntegralRewardData, err error) {
var (
ok bool
)
this.hlock.Lock()
result, ok = this.reward[hid<<8+itype]
this.hlock.Unlock()
if !ok {
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_integralreward, fmt.Sprintf("hid:%d,itype :%d", hid, itype))
}
return
}
// 获取积分boss debuff 条件
func (this *configureComp) GetIntegralCondition() (result []*cfg.GameIntegralConditionData) {
if v, err := this.GetConfigure(game_integralcondition); err == nil {
if configure, ok := v.(*cfg.GameIntegralCondition); ok {
for _, v1 := range configure.GetDataList() {
if v1.IType == 1 {
result = append(result, v1)
}
}
}
}
return
}
// 通过id获取数据
func (this *configureComp) GetIntegralConditionByKey(id int32) (result *cfg.GameIntegralConditionData) {
if v, err := this.GetConfigure(game_integralcondition); err == nil {
if configure, ok := v.(*cfg.GameIntegralCondition); ok {
return configure.Get(id)
}
}
return
}
func (this *configureComp) LoadIntegralCondition() {
if v, err := this.GetConfigure(game_integralcondition); err == nil {
this.hlock.Lock()
defer this.hlock.Unlock()
this.task = make(map[int32]*cfg.GameIntegralConditionData)
if _configure, ok := v.(*cfg.GameIntegralCondition); ok {
for _, v := range _configure.GetDataList() {
if v.IType == 1 {
this.task[v.TaskId] = v
}
}
return
}
} else {
err = fmt.Errorf("%T no is *cfg.game_integralcondition", v)
}
}
func (this *configureComp) GetIntegralConditionByTask(taskid int32) (result *cfg.GameIntegralConditionData, err error) {
this.hlock.Lock()
result = this.task[taskid]
this.hlock.Unlock()
if result == nil {
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_integralcondition, taskid)
}
return
}

15
modules/integral/model_integral.go
View File

@ -52,7 +52,6 @@ func (this *modelIntegral) getIntegralList(uid string) (result *pb.DBIntegralBos
for _, v := range szConf {
if curTime >= int64(v.Openday)+openTime && curTime <= int64(v.Endday)+openTime {
result.Hid = v.Endday
result.Etime = int64(v.Endday) + openTime
result.CTime = curTime
break
@ -63,6 +62,20 @@ func (this *modelIntegral) getIntegralList(uid string) (result *pb.DBIntegralBos
if conf, err = this.module.configure.GetStageBoss(result.Hid, 1); err == nil {
result.Itype = conf.Itype // 获取类型
result.Nandu = 1 // 初始难度1
var szTaskid []int32
for _, v := range this.module.configure.GetIntegralCondition() {
szTaskid = append(szTaskid, v.TaskId) // 获取任务id
}
if data, err := this.module.ModuleBuried.CheckCondition(uid, szTaskid...); err == nil {
for _, v := range data {
if v.State == pb.BuriedItemFinishState_buried_finish {
if c, e := this.module.configure.GetIntegralConditionByTask(v.Conid); e == nil {
result.Buff[v.Conid] = c.Id
}
}
}
}
}
err = this.Add(uid, result) // 入库

1
modules/monkey/configure.go
View File

@ -24,6 +24,7 @@ type configureComp struct {
func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
err = this.MCompConfigure.Init(service, module, comp, options)
this.module = module.(*Monkey)
err = this.LoadConfigure(monkey_main, cfg.NewGameMonkeyMain)
configure.RegisterConfigure(monkey_reward, cfg.NewGameMonkeyReward, func() {

20
pb/battle_db.pb.go
View File

@ -106,6 +106,7 @@ const (
PlayType_stone PlayType = 18 // 石阵秘境
PlayType_expboos PlayType = 19 //经验副本
PlayType_isLand PlayType = 20 //海岛
PlayType_integral PlayType = 21 //积分boss
)
// Enum value maps for PlayType.
@ -132,6 +133,7 @@ var (
18: "stone",
19: "expboos",
20: "isLand",
21: "integral",
}
PlayType_value = map[string]int32{
"null": 0,
@ -155,6 +157,7 @@ var (
"stone": 18,
"expboos": 19,
"isLand": 20,
"integral": 21,
}
)
@ -828,7 +831,7 @@ var file_battle_battle_db_proto_rawDesc = []byte{
0x69, 0x6c, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x65, 0x10, 0x01, 0x12, 0x07, 0x0a,
0x03, 0x70, 0x76, 0x70, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x62, 0x10, 0x03, 0x12,
0x07, 0x0a, 0x03, 0x65, 0x76, 0x65, 0x10, 0x04, 0x12, 0x09, 0x0a, 0x05, 0x72, 0x74, 0x70, 0x76,
0x70, 0x10, 0x05, 0x12, 0x08, 0x0a, 0x04, 0x6c, 0x70, 0x65, 0x76, 0x10, 0x06, 0x2a, 0x9c, 0x02,
0x70, 0x10, 0x05, 0x12, 0x08, 0x0a, 0x04, 0x6c, 0x70, 0x65, 0x76, 0x10, 0x06, 0x2a, 0xaa, 0x02,
0x0a, 0x08, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x6e, 0x75,
0x6c, 0x6c, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x6d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65,
0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x10, 0x02, 0x12, 0x09,
@ -846,13 +849,14 @@ var file_battle_battle_db_proto_rawDesc = []byte{
0x09, 0x0a, 0x05, 0x63, 0x79, 0x63, 0x6c, 0x65, 0x10, 0x10, 0x12, 0x0c, 0x0a, 0x08, 0x67, 0x75,
0x69, 0x6c, 0x64, 0x67, 0x76, 0x65, 0x10, 0x11, 0x12, 0x09, 0x0a, 0x05, 0x73, 0x74, 0x6f, 0x6e,
0x65, 0x10, 0x12, 0x12, 0x0b, 0x0a, 0x07, 0x65, 0x78, 0x70, 0x62, 0x6f, 0x6f, 0x73, 0x10, 0x13,
0x12, 0x0a, 0x0a, 0x06, 0x69, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x10, 0x14, 0x2a, 0x1f, 0x0a, 0x0c,
0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x06, 0x0a, 0x02,
0x69, 0x6e, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x10, 0x02, 0x2a, 0x2b, 0x0a,
0x0c, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x12, 0x08, 0x0a,
0x04, 0x64, 0x72, 0x61, 0x77, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x10, 0x01,
0x12, 0x08, 0x0a, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x10, 0x02, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x12, 0x0a, 0x0a, 0x06, 0x69, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x10, 0x14, 0x12, 0x0c, 0x0a, 0x08,
0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x10, 0x15, 0x2a, 0x1f, 0x0a, 0x0c, 0x42, 0x42,
0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x69, 0x6e,
0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x10, 0x02, 0x2a, 0x2b, 0x0a, 0x0c, 0x44,
0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x12, 0x08, 0x0a, 0x04, 0x64,
0x72, 0x61, 0x77, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x10, 0x01, 0x12, 0x08,
0x0a, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x10, 0x02, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (

4
pb/integral_db.pb.go
View File

@ -34,8 +34,8 @@ type DBIntegralBoss struct {
Hid int32 `protobuf:"varint,7,opt,name=hid,proto3" json:"hid"` // 活动id
Maxscore int64 `protobuf:"varint,8,opt,name=maxscore,proto3" json:"maxscore"` // 最大积分
Totalscore int64 `protobuf:"varint,9,opt,name=totalscore,proto3" json:"totalscore"` // 累计积分
Reward1 int32 `protobuf:"varint,10,opt,name=reward1,proto3" json:"reward1"` // 类型1 奖励( Integralreward cid )
Reward2 int32 `protobuf:"varint,11,opt,name=reward2,proto3" json:"reward2"` // 类型2 奖励( Integralreward cid )
Reward1 int32 `protobuf:"varint,10,opt,name=reward1,proto3" json:"reward1"` // 类型1 奖励( Integralreward )
Reward2 int32 `protobuf:"varint,11,opt,name=reward2,proto3" json:"reward2"` // 类型2 奖励( Integralreward )
Buff map[int32]int32 `protobuf:"bytes,12,rep,name=buff,proto3" json:"buff" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 激活的buff (key Integralcondition value :0 未激活) 注:事件类型 才有值
Nandu int32 `protobuf:"varint,13,opt,name=nandu,proto3" json:"nandu"` // 已经解锁的难度
Score map[int32]int64 `protobuf:"bytes,14,rep,name=score,proto3" json:"score" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 难度 value 积分

231
pb/integral_msg.pb.go
View File

@ -327,6 +327,109 @@ func (x *IntegralChallengeOverResp) GetData() *DBIntegralBoss {
return nil
}
// 领取奖励
type IntegralGetRewardReq struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Itype int32 `protobuf:"varint,1,opt,name=itype,proto3" json:"itype"` // 1 评级奖励 2 累计奖励
}
func (x *IntegralGetRewardReq) Reset() {
*x = IntegralGetRewardReq{}
if protoimpl.UnsafeEnabled {
mi := &file_integral_integral_msg_proto_msgTypes[6]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *IntegralGetRewardReq) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*IntegralGetRewardReq) ProtoMessage() {}
func (x *IntegralGetRewardReq) ProtoReflect() protoreflect.Message {
mi := &file_integral_integral_msg_proto_msgTypes[6]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use IntegralGetRewardReq.ProtoReflect.Descriptor instead.
func (*IntegralGetRewardReq) Descriptor() ([]byte, []int) {
return file_integral_integral_msg_proto_rawDescGZIP(), []int{6}
}
func (x *IntegralGetRewardReq) GetItype() int32 {
if x != nil {
return x.Itype
}
return 0
}
type IntegralGetRewardResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Data *DBIntegralBoss `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
Award []*UserAtno `protobuf:"bytes,4,rep,name=award,proto3" json:"award"` //奖励
}
func (x *IntegralGetRewardResp) Reset() {
*x = IntegralGetRewardResp{}
if protoimpl.UnsafeEnabled {
mi := &file_integral_integral_msg_proto_msgTypes[7]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *IntegralGetRewardResp) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*IntegralGetRewardResp) ProtoMessage() {}
func (x *IntegralGetRewardResp) ProtoReflect() protoreflect.Message {
mi := &file_integral_integral_msg_proto_msgTypes[7]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use IntegralGetRewardResp.ProtoReflect.Descriptor instead.
func (*IntegralGetRewardResp) Descriptor() ([]byte, []int) {
return file_integral_integral_msg_proto_rawDescGZIP(), []int{7}
}
func (x *IntegralGetRewardResp) GetData() *DBIntegralBoss {
if x != nil {
return x.Data
}
return nil
}
func (x *IntegralGetRewardResp) GetAward() []*UserAtno {
if x != nil {
return x.Award
}
return nil
}
var File_integral_integral_msg_proto protoreflect.FileDescriptor
var file_integral_integral_msg_proto_rawDesc = []byte{
@ -335,34 +438,44 @@ var file_integral_integral_msg_proto_rawDesc = []byte{
0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x62, 0x61, 0x74, 0x74, 0x6c,
0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x22, 0x14, 0x0a, 0x12, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x47, 0x65,
0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x3a, 0x0a, 0x13, 0x49, 0x6e, 0x74, 0x65,
0x67, 0x72, 0x61, 0x6c, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12,
0x23, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e,
0x44, 0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x42, 0x6f, 0x73, 0x73, 0x52, 0x04,
0x64, 0x61, 0x74, 0x61, 0x22, 0x56, 0x0a, 0x14, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05,
0x6e, 0x61, 0x6e, 0x64, 0x75, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e,
0x64, 0x75, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01,
0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61,
0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x4e, 0x0a, 0x15,
0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67,
0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20,
0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f,
0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x18,
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x22, 0x6d, 0x0a, 0x18,
0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67,
0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x64,
0x75, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x12, 0x25,
0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d,
0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72,
0x65, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x03,
0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x22, 0x40, 0x0a, 0x19, 0x49,
0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65,
0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61,
0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65, 0x67,
0x72, 0x61, 0x6c, 0x42, 0x6f, 0x73, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x5a,
0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x14,
0x0a, 0x12, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73,
0x74, 0x52, 0x65, 0x71, 0x22, 0x3a, 0x0a, 0x13, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x64,
0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x49, 0x6e,
0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x42, 0x6f, 0x73, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
0x22, 0x56, 0x0a, 0x14, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x43, 0x68, 0x61, 0x6c,
0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x64,
0x75, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x12, 0x28,
0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10,
0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e,
0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x4e, 0x0a, 0x15, 0x49, 0x6e, 0x74, 0x65,
0x67, 0x72, 0x61, 0x6c, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73,
0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e,
0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x18, 0x02, 0x20, 0x01, 0x28,
0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x22, 0x6d, 0x0a, 0x18, 0x49, 0x6e, 0x74, 0x65,
0x67, 0x72, 0x61, 0x6c, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65,
0x72, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x18, 0x01, 0x20,
0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65,
0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74,
0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72,
0x74, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03,
0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x22, 0x40, 0x0a, 0x19, 0x49, 0x6e, 0x74, 0x65, 0x67,
0x72, 0x61, 0x6c, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72,
0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01,
0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x42,
0x6f, 0x73, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2c, 0x0a, 0x14, 0x49, 0x6e, 0x74,
0x65, 0x67, 0x72, 0x61, 0x6c, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65,
0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
0x52, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x22, 0x5d, 0x0a, 0x15, 0x49, 0x6e, 0x74, 0x65, 0x67,
0x72, 0x61, 0x6c, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70,
0x12, 0x23, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f,
0x2e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x42, 0x6f, 0x73, 0x73, 0x52,
0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04,
0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52,
0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@ -377,7 +490,7 @@ func file_integral_integral_msg_proto_rawDescGZIP() []byte {
return file_integral_integral_msg_proto_rawDescData
}
var file_integral_integral_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
var file_integral_integral_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
var file_integral_integral_msg_proto_goTypes = []interface{}{
(*IntegralGetListReq)(nil), // 0: IntegralGetListReq
(*IntegralGetListResp)(nil), // 1: IntegralGetListResp
@ -385,22 +498,27 @@ var file_integral_integral_msg_proto_goTypes = []interface{}{
(*IntegralChallengeResp)(nil), // 3: IntegralChallengeResp
(*IntegralChallengeOverReq)(nil), // 4: IntegralChallengeOverReq
(*IntegralChallengeOverResp)(nil), // 5: IntegralChallengeOverResp
(*DBIntegralBoss)(nil), // 6: DBIntegralBoss
(*BattleFormation)(nil), // 7: BattleFormation
(*BattleInfo)(nil), // 8: BattleInfo
(*BattleReport)(nil), // 9: BattleReport
(*IntegralGetRewardReq)(nil), // 6: IntegralGetRewardReq
(*IntegralGetRewardResp)(nil), // 7: IntegralGetRewardResp
(*DBIntegralBoss)(nil), // 8: DBIntegralBoss
(*BattleFormation)(nil), // 9: BattleFormation
(*BattleInfo)(nil), // 10: BattleInfo
(*BattleReport)(nil), // 11: BattleReport
(*UserAtno)(nil), // 12: UserAtno
}
var file_integral_integral_msg_proto_depIdxs = []int32{
6, // 0: IntegralGetListResp.data:type_name -> DBIntegralBoss
7, // 1: IntegralChallengeReq.battle:type_name -> BattleFormation
8, // 2: IntegralChallengeResp.info:type_name -> BattleInfo
9, // 3: IntegralChallengeOverReq.report:type_name -> BattleReport
6, // 4: IntegralChallengeOverResp.data:type_name -> DBIntegralBoss
5, // [5:5] is the sub-list for method output_type
5, // [5:5] is the sub-list for method input_type
5, // [5:5] is the sub-list for extension type_name
5, // [5:5] is the sub-list for extension extendee
0, // [0:5] is the sub-list for field type_name
8, // 0: IntegralGetListResp.data:type_name -> DBIntegralBoss
9, // 1: IntegralChallengeReq.battle:type_name -> BattleFormation
10, // 2: IntegralChallengeResp.info:type_name -> BattleInfo
11, // 3: IntegralChallengeOverReq.report:type_name -> BattleReport
8, // 4: IntegralChallengeOverResp.data:type_name -> DBIntegralBoss
8, // 5: IntegralGetRewardResp.data:type_name -> DBIntegralBoss
12, // 6: IntegralGetRewardResp.award:type_name -> UserAtno
7, // [7:7] is the sub-list for method output_type
7, // [7:7] is the sub-list for method input_type
7, // [7:7] is the sub-list for extension type_name
7, // [7:7] is the sub-list for extension extendee
0, // [0:7] is the sub-list for field type_name
}
func init() { file_integral_integral_msg_proto_init() }
@ -410,6 +528,7 @@ func file_integral_integral_msg_proto_init() {
}
file_integral_integral_db_proto_init()
file_battle_battle_msg_proto_init()
file_comm_proto_init()
if !protoimpl.UnsafeEnabled {
file_integral_integral_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*IntegralGetListReq); i {
@ -483,6 +602,30 @@ func file_integral_integral_msg_proto_init() {
return nil
}
}
file_integral_integral_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*IntegralGetRewardReq); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_integral_integral_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*IntegralGetRewardResp); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
}
type x struct{}
out := protoimpl.TypeBuilder{
@ -490,7 +633,7 @@ func file_integral_integral_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_integral_integral_msg_proto_rawDesc,
NumEnums: 0,
NumMessages: 6,
NumMessages: 8,
NumExtensions: 0,
NumServices: 0,
},

4
sys/configure/structs/Game.IntegralConditionData.go
View File

@ -13,6 +13,8 @@ import "errors"
type GameIntegralConditionData struct {
Id int32
Condition string
TaskId int32
IType int32
Condval string
Jumpto int32
Des string
@ -28,6 +30,8 @@ func (*GameIntegralConditionData) GetTypeId() int32 {
func (_v *GameIntegralConditionData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; if _v.Condition, _ok_ = _buf["condition"].(string); !_ok_ { err = errors.New("condition error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["TaskId"].(float64); !_ok_ { err = errors.New("TaskId error"); return }; _v.TaskId = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["iType"].(float64); !_ok_ { err = errors.New("iType error"); return }; _v.IType = int32(_tempNum_) }
{ var _ok_ bool; if _v.Condval, _ok_ = _buf["condval"].(string); !_ok_ { err = errors.New("condval error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["jumpto"].(float64); !_ok_ { err = errors.New("jumpto error"); return }; _v.Jumpto = int32(_tempNum_) }
{ var _ok_ bool; if _v.Des, _ok_ = _buf["des"].(string); !_ok_ { err = errors.New("des error"); return } }

14
sys/configure/structs/Game.Loading.go
View File

@ -9,34 +9,26 @@
package cfg
type GameLoading struct {
_dataMap map[int32]*GameLoadingData
_dataList []*GameLoadingData
}
func NewGameLoading(_buf []map[string]interface{}) (*GameLoading, error) {
_dataList := make([]*GameLoadingData, 0, len(_buf))
dataMap := make(map[int32]*GameLoadingData)
for _, _ele_ := range _buf {
if _v, err2 := DeserializeGameLoadingData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
return &GameLoading{_dataList:_dataList, _dataMap:dataMap}, nil
}
func (table *GameLoading) GetDataMap() map[int32]*GameLoadingData {
return table._dataMap
return &GameLoading{_dataList:_dataList}, nil
}
func (table *GameLoading) GetDataList() []*GameLoadingData {
return table._dataList
}
func (table *GameLoading) Get(key int32) *GameLoadingData {
return table._dataMap[key]
func (table *GameLoading) Get(index int) *GameLoadingData {
return table._dataList[index]
}

4
sys/configure/structs/Game.LoadingData.go
View File

@ -11,8 +11,8 @@ package cfg
import "errors"
type GameLoadingData struct {
Id int32
Scene string
SubScene string
Image string
Icon string
Title string
@ -26,8 +26,8 @@ func (*GameLoadingData) GetTypeId() int32 {
}
func (_v *GameLoadingData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; if _v.Scene, _ok_ = _buf["scene"].(string); !_ok_ { err = errors.New("scene error"); return } }
{ var _ok_ bool; if _v.SubScene, _ok_ = _buf["subScene"].(string); !_ok_ { err = errors.New("subScene error"); return } }
{ var _ok_ bool; if _v.Image, _ok_ = _buf["image"].(string); !_ok_ { err = errors.New("image error"); return } }
{ var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["title"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Title error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Title, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }

1
sys/configure/structs/Game.OpencondType.go
View File

@ -14,4 +14,5 @@ const (
GameOpencondType_Maxmapid = 2
GameOpencondType_Worldtaskid = 3
GameOpencondType_Friend = 4
GameOpencondType_MoonLevel = 5
)

16
sys/configure/structs/Story.EStoryType.go Normal file
View File

@ -0,0 +1,16 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
const (
StoryEStoryType_None = 0
StoryEStoryType_ShowSpider = 1
StoryEStoryType_HidePlayer = 2
StoryEStoryType_Aside = 3
)

18
sys/configure/structs/Story.ETxtEffect.go Normal file
View File

@ -0,0 +1,18 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
const (
StoryETxtEffect_None = 0
StoryETxtEffect_DialogShake = 1
StoryETxtEffect_LensShake = 2
StoryETxtEffect_PlayEffect = 3
StoryETxtEffect_UIEffect = 4
StoryETxtEffect_BlackScreen = 5
)