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

boss 任务统计

Browse Source
This commit is contained in:
meixiongfeng 2023-12-07 16:09:07 +08:00
parent c5ee713d71
commit 11a58fee8c
30 changed files with 4326 additions and 635 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": "",

6
bin/json/game_battleready.json
View File

@ -1839,7 +1839,7 @@
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [
"24008"
"33005"
],
"LockSlots": [],
"HeroCheck": [],
@ -2037,9 +2037,9 @@
"id": 10103010,
"PlayType": 1,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_03",
"readyScene": "scenesfight_role_interface_02",
"battleScenes": [
"scenesfight_05_01"
"bossfight_spinymandrilla_02"
],
"BGMusic": "",
"LoadingId": 0,

144
bin/json/game_catchbugreward.json
View File

@ -1,6 +1,7 @@
[
{
"key": 1001,
"type": 1,
"condition": 15,
"reward": [
{
@ -17,6 +18,7 @@
},
{
"key": 1002,
"type": 1,
"condition": 20,
"reward": [
{
@ -33,6 +35,7 @@
},
{
"key": 1003,
"type": 1,
"condition": 25,
"reward": [
{
@ -49,6 +52,7 @@
},
{
"key": 1004,
"type": 1,
"condition": 30,
"reward": [
{
@ -65,6 +69,7 @@
},
{
"key": 1005,
"type": 1,
"condition": 35,
"reward": [
{
@ -81,6 +86,7 @@
},
{
"key": 1006,
"type": 1,
"condition": 40,
"reward": [
{
@ -97,6 +103,7 @@
},
{
"key": 1007,
"type": 1,
"condition": 45,
"reward": [
{
@ -113,6 +120,7 @@
},
{
"key": 1008,
"type": 1,
"condition": 50,
"reward": [
{
@ -126,5 +134,141 @@
"n": 100000
}
]
},
{
"key": 2001,
"type": 2,
"condition": 1,
"reward": [
{
"a": "item",
"t": "10000001",
"n": 1
},
{
"a": "attr",
"t": "gold",
"n": 100000
}
]
},
{
"key": 2002,
"type": 2,
"condition": 2,
"reward": [
{
"a": "item",
"t": "10000001",
"n": 1
},
{
"a": "attr",
"t": "gold",
"n": 100000
}
]
},
{
"key": 2003,
"type": 2,
"condition": 3,
"reward": [
{
"a": "item",
"t": "10000001",
"n": 1
},
{
"a": "attr",
"t": "gold",
"n": 100000
}
]
},
{
"key": 2004,
"type": 2,
"condition": 4,
"reward": [
{
"a": "item",
"t": "10000001",
"n": 1
},
{
"a": "attr",
"t": "gold",
"n": 100000
}
]
},
{
"key": 2005,
"type": 2,
"condition": 5,
"reward": [
{
"a": "item",
"t": "10000001",
"n": 1
},
{
"a": "attr",
"t": "gold",
"n": 100000
}
]
},
{
"key": 2006,
"type": 2,
"condition": 6,
"reward": [
{
"a": "item",
"t": "10000001",
"n": 1
},
{
"a": "attr",
"t": "gold",
"n": 100000
}
]
},
{
"key": 2007,
"type": 2,
"condition": 7,
"reward": [
{
"a": "item",
"t": "10000001",
"n": 1
},
{
"a": "attr",
"t": "gold",
"n": 100000
}
]
},
{
"key": 2008,
"type": 2,
"condition": 8,
"reward": [
{
"a": "item",
"t": "10000001",
"n": 1
},
{
"a": "attr",
"t": "gold",
"n": 100000
}
]
}
]

226
bin/json/game_catchbugstage.json
View File

@ -3,7 +3,7 @@
"id": 1001,
"cardnum": {
"k": 4,
"v": 4
"v": 6
},
"stagetime": 120,
"skill": [],
@ -23,16 +23,23 @@
"text": "第1关"
},
"stageskill": {
"key": "",
"text": ""
"key": "catchbugs_stage_stageskill_1",
"text": "本周暂无技能"
},
"points": 4
"points": 24,
"consume": [
{
"a": "item",
"t": "24022003",
"n": 1
}
]
},
{
"id": 1002,
"cardnum": {
"k": 4,
"v": 4
"v": 6
},
"stagetime": 120,
"skill": [],
@ -52,16 +59,23 @@
"text": "第2关"
},
"stageskill": {
"key": "",
"key": "catchbugs_stage_stageskill_2",
"text": ""
},
"points": 5
"points": 24,
"consume": [
{
"a": "item",
"t": "24022003",
"n": 1
}
]
},
{
"id": 1003,
"cardnum": {
"k": 4,
"v": 4
"v": 6
},
"stagetime": 120,
"skill": [],
@ -84,13 +98,20 @@
"key": "catchbugs_stage_stageskill_3",
"text": ""
},
"points": 6
"points": 24,
"consume": [
{
"a": "item",
"t": "24022003",
"n": 1
}
]
},
{
"id": 1004,
"cardnum": {
"k": 4,
"v": 4
"v": 6
},
"stagetime": 120,
"skill": [
@ -117,13 +138,20 @@
"key": "catchbugs_stage_stageskill_4",
"text": ""
},
"points": 7
"points": 24,
"consume": [
{
"a": "item",
"t": "24022003",
"n": 1
}
]
},
{
"id": 1005,
"cardnum": {
"k": 4,
"v": 4
"v": 6
},
"stagetime": 120,
"skill": [
@ -150,173 +178,13 @@
"key": "catchbugs_stage_stageskill_5",
"text": ""
},
"points": 8
},
"points": 24,
"consume": [
{
"id": 1006,
"cardnum": {
"k": 4,
"v": 4
},
"stagetime": 120,
"skill": [
3
],
"skilltime": [
20
],
"deducttime": [
1,
2,
3
],
"rewardtime": [
0,
0,
0
],
"stagedetail": {
"key": "catchbugs_stage_stagedetail_6",
"text": "第6关"
},
"stageskill": {
"key": "catchbugs_stage_stageskill_6",
"text": ""
},
"points": 9
},
{
"id": 1007,
"cardnum": {
"k": 4,
"v": 4
},
"stagetime": 120,
"skill": [
4
],
"skilltime": [
20
],
"deducttime": [
1,
2,
3
],
"rewardtime": [
0,
0,
0
],
"stagedetail": {
"key": "catchbugs_stage_stagedetail_7",
"text": "第7关"
},
"stageskill": {
"key": "catchbugs_stage_stageskill_7",
"text": ""
},
"points": 10
},
{
"id": 1008,
"cardnum": {
"k": 4,
"v": 4
},
"stagetime": 120,
"skill": [
1
],
"skilltime": [
20
],
"deducttime": [
1,
2,
3
],
"rewardtime": [
0,
0,
0
],
"stagedetail": {
"key": "catchbugs_stage_stagedetail_8",
"text": "第8关"
},
"stageskill": {
"key": "catchbugs_stage_stageskill_8",
"text": ""
},
"points": 11
},
{
"id": 1009,
"cardnum": {
"k": 4,
"v": 6
},
"stagetime": 120,
"skill": [
2
],
"skilltime": [
20
],
"deducttime": [
1,
2,
3
],
"rewardtime": [
0,
0,
0
],
"stagedetail": {
"key": "catchbugs_stage_stagedetail_9",
"text": "第9关"
},
"stageskill": {
"key": "catchbugs_stage_stageskill_9",
"text": ""
},
"points": 12
},
{
"id": 1010,
"cardnum": {
"k": 4,
"v": 6
},
"stagetime": 120,
"skill": [
3,
4
],
"skilltime": [
20,
20
],
"deducttime": [
1,
2,
3
],
"rewardtime": [
0,
0,
0
],
"stagedetail": {
"key": "catchbugs_stage_stagedetail_10",
"text": "第10关"
},
"stageskill": {
"key": "catchbugs_stage_stageskill_10",
"text": ""
},
"points": 13
"a": "item",
"t": "24022003",
"n": 1
}
]
}
]

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个被动效果",

41
bin/json/game_item.json
View File

@ -21513,5 +21513,46 @@
},
"sale": [],
"gm": 0
},
{
"id": "24022003",
"name": {
"key": "item_item_name_437",
"text": "捉虫子游玩次数"
},
"usetype": 0,
"color": 0,
"bagtype": 0,
"index": 0,
"special_type": 0,
"hold": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"img": "wp_icon_jjcq",
"intr": {
"key": "item_item_intr_439",
"text": ""
},
"describe": {
"key": "item_item_describe_439",
"text": ""
},
"dialogue": {
"key": "item_item_dialogue_437",
"text": ""
},
"sale": [],
"gm": 0
}
]

12
bin/json/game_mainstage.json
View File

@ -9682,7 +9682,7 @@
],
"BattleReadyID": 10103007,
"FormatList": [
121011
102011
],
"helphero": [],
"banhero": [],
@ -9961,7 +9961,7 @@
],
"BattleReadyID": 10103007,
"FormatList": [
121021
102021
],
"helphero": [],
"banhero": [],
@ -10029,7 +10029,7 @@
"destroy": 1,
"progress": 1,
"stroyshow": 0,
"frontstoryid": 201110,
"frontstoryid": 201100,
"afterstoryid": 201120,
"maingroupName": {
"key": "",
@ -10080,7 +10080,7 @@
],
"BattleReadyID": 10103008,
"FormatList": [
121031
102031
],
"helphero": [],
"banhero": [],
@ -11375,7 +11375,7 @@
"buried_type": 0,
"buried": 0,
"grouptype": [],
"Episodetype": 4,
"Episodetype": 3,
"stage_param": 0,
"inherit": 0,
"battle_fail": 0,
@ -11548,7 +11548,7 @@
],
"BattleReadyID": 10103010,
"FormatList": [
121071
102071
],
"helphero": [],
"banhero": [],

40
bin/json/game_monkeymain.json
View File

@ -13,11 +13,11 @@
"startype": [
{
"k": 1,
"v": 60
"v": 10
},
{
"k": 1,
"v": 90
"v": 20
},
{
"k": 2,
@ -39,11 +39,11 @@
"startype": [
{
"k": 1,
"v": 60
"v": 10
},
{
"k": 1,
"v": 90
"v": 20
},
{
"k": 2,
@ -65,11 +65,11 @@
"startype": [
{
"k": 1,
"v": 60
"v": 10
},
{
"k": 1,
"v": 90
"v": 20
},
{
"k": 2,
@ -91,11 +91,11 @@
"startype": [
{
"k": 1,
"v": 60
"v": 10
},
{
"k": 1,
"v": 90
"v": 20
},
{
"k": 2,
@ -117,11 +117,11 @@
"startype": [
{
"k": 1,
"v": 60
"v": 10
},
{
"k": 1,
"v": 90
"v": 20
},
{
"k": 2,
@ -143,11 +143,11 @@
"startype": [
{
"k": 1,
"v": 60
"v": 10
},
{
"k": 1,
"v": 90
"v": 20
},
{
"k": 2,
@ -169,11 +169,11 @@
"startype": [
{
"k": 1,
"v": 60
"v": 10
},
{
"k": 1,
"v": 90
"v": 20
},
{
"k": 2,
@ -195,11 +195,11 @@
"startype": [
{
"k": 1,
"v": 60
"v": 10
},
{
"k": 1,
"v": 90
"v": 20
},
{
"k": 2,
@ -221,11 +221,11 @@
"startype": [
{
"k": 1,
"v": 60
"v": 10
},
{
"k": 1,
"v": 90
"v": 20
},
{
"k": 2,
@ -247,11 +247,11 @@
"startype": [
{
"k": 1,
"v": 60
"v": 10
},
{
"k": 1,
"v": 90
"v": 20
},
{
"k": 2,

180
bin/json/game_monkeystage.json
View File

@ -13,7 +13,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -26,16 +26,12 @@
"k": 1,
"v": 2000
},
{
"k": 2,
"v": 2000
},
{
"k": 5,
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -48,16 +44,12 @@
"k": 3,
"v": 1000
},
{
"k": 4,
"v": 1500
},
{
"k": 5,
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -70,16 +62,12 @@
"k": 1,
"v": 2500
},
{
"k": 4,
"v": 1500
},
{
"k": 5,
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 1
},
@ -92,24 +80,12 @@
"k": 3,
"v": 200
},
{
"k": 5,
"v": 600
},
{
"k": 1,
"v": 2000
},
{
"k": 2,
"v": 2000
},
{
"k": 5,
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -122,20 +98,12 @@
"k": 4,
"v": 3000
},
{
"k": 1,
"v": 2500
},
{
"k": 2,
"v": 2000
},
{
"k": 5,
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -148,20 +116,12 @@
"k": 3,
"v": 3000
},
{
"k": 4,
"v": 2500
},
{
"k": 1,
"v": 2000
},
{
"k": 5,
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -179,7 +139,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -201,7 +161,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 0
},
@ -223,7 +183,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -245,7 +205,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 1
},
@ -275,7 +235,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -301,7 +261,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -327,7 +287,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -345,7 +305,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -367,7 +327,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 0
},
@ -389,7 +349,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -411,7 +371,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 1
},
@ -441,7 +401,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -467,7 +427,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -493,7 +453,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -511,7 +471,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -533,7 +493,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 0
},
@ -555,7 +515,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -577,7 +537,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 1
},
@ -607,7 +567,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -633,7 +593,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -659,7 +619,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -677,7 +637,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -699,7 +659,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 0
},
@ -721,7 +681,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -743,7 +703,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 1
},
@ -773,7 +733,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -799,7 +759,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -825,7 +785,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -843,7 +803,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -865,7 +825,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 0
},
@ -887,7 +847,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -909,7 +869,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 1
},
@ -939,7 +899,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -965,7 +925,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -991,7 +951,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1009,7 +969,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1031,7 +991,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 0
},
@ -1053,7 +1013,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1075,7 +1035,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 1
},
@ -1105,7 +1065,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1131,7 +1091,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1157,7 +1117,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1175,7 +1135,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1197,7 +1157,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 0
},
@ -1219,7 +1179,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1241,7 +1201,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 1
},
@ -1271,7 +1231,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1297,7 +1257,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1323,7 +1283,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1341,7 +1301,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1363,7 +1323,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 0
},
@ -1385,7 +1345,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1407,7 +1367,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 1
},
@ -1437,7 +1397,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1463,7 +1423,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1489,7 +1449,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1507,7 +1467,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1529,7 +1489,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 0
},
@ -1551,7 +1511,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1573,7 +1533,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 1
},
@ -1603,7 +1563,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1629,7 +1589,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
},
@ -1655,7 +1615,7 @@
"v": 600
}
],
"roundinterval": 5,
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
}

56
bin/json/game_monsterformat.json
View File

@ -625,7 +625,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": 24008,
"heroid": 51006,
"star": 3,
"equip": [],
"newskill": [],
@ -645,7 +645,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": 34008,
"heroid": 51006,
"star": 3,
"equip": [],
"newskill": [],
@ -3607,7 +3607,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": -1,
"heroid": 44005,
"star": 3,
"equip": [],
"newskill": [],
@ -3627,7 +3627,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": 44005,
"heroid": 34004,
"star": 3,
"equip": [],
"newskill": [],
@ -3647,7 +3647,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": 34004,
"heroid": 33002,
"star": 3,
"equip": [],
"newskill": [],
@ -3667,7 +3667,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": 33002,
"heroid": -1,
"star": 3,
"equip": [],
"newskill": [],
@ -3907,14 +3907,14 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": -1,
"heroid": 34004,
"star": 3,
"equip": [],
"newskill": [],
"lv": 6,
"hppro": 0.85,
"atkpro": 1.3,
"defpro": 0.89,
"hppro": 3.5,
"atkpro": 2,
"defpro": 0.9,
"skill1": 1,
"skill2": 1,
"skill3": 1,
@ -3947,7 +3947,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": 34004,
"heroid": -1,
"star": 3,
"equip": [],
"newskill": [],
@ -4207,14 +4207,14 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": -1,
"heroid": 34004,
"star": 3,
"equip": [],
"newskill": [],
"lv": 7,
"hppro": 0.86,
"atkpro": 1.3,
"defpro": 0.9,
"hppro": 0.5,
"atkpro": 0.5,
"defpro": 0.58,
"skill1": 1,
"skill2": 1,
"skill3": 1,
@ -4247,7 +4247,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": 34004,
"heroid": -1,
"star": 3,
"equip": [],
"newskill": [],
@ -4507,7 +4507,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": -1,
"heroid": 51012,
"star": 3,
"equip": [],
"newskill": [],
@ -4567,7 +4567,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 0,
"heroid": 51012,
"heroid": -1,
"star": 3,
"equip": [],
"newskill": [],
@ -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,
@ -238147,13 +238147,13 @@
"captainId": 1,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": 33002,
"heroid": 13002,
"star": 3,
"equip": [],
"newskill": [],
"lv": 10,
"hppro": 1,
"atkpro": 1,
"hppro": 2,
"atkpro": 2,
"defpro": 1,
"skill1": 1,
"skill2": 1,

50
bin/json/game_restore.json Normal file
View File

@ -0,0 +1,50 @@
[
{
"key": 1,
"tpye": 1,
"cycle": 1,
"maximums": [
{
"a": "item",
"t": "24022003",
"n": 3
}
]
},
{
"key": 2,
"tpye": 1,
"cycle": 1,
"maximums": [
{
"a": "item",
"t": "24013003",
"n": 8
}
]
},
{
"key": 3,
"tpye": 1,
"cycle": 1,
"maximums": [
{
"a": "item",
"t": "18000004",
"n": 10
}
]
},
{
"key": 4,
"tpye": 2,
"cycle": 30,
"maximums": [
{
"a": "attr",
"t": "consumeexp",
"n": 0
}
]
}
]

3534
bin/json/game_skillatk.json
View File

File diff suppressed because it is too large Load Diff

160
bin/json/game_skillpassive.json
View File

@ -9519,5 +9519,165 @@
"Callback": [
933005314
]
},
{
"Id": 451105211,
"When": 10,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 1,
"Callback": [
251105213
]
},
{
"Id": 451112211,
"When": 15,
"FromCheck": "",
"TargetCheck": "Target=3",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 1,
"Callback": [
251112212
]
},
{
"Id": 451305111,
"When": 10,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 1,
"Callback": [
251305113
]
},
{
"Id": 451305211,
"When": 10,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "MainSkillID=151305211",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 1,
"Callback": [
251305213
]
},
{
"Id": 451312211,
"When": 15,
"FromCheck": "",
"TargetCheck": "Target=3",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 1,
"Callback": [
251312212
]
},
{
"Id": 451505111,
"When": 10,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 1,
"Callback": [
251505113
]
},
{
"Id": 451505211,
"When": 10,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "MainSkillID=151505211",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 1,
"Callback": [
251505213
]
},
{
"Id": 451512211,
"When": 15,
"FromCheck": "",
"TargetCheck": "Target=3",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 1,
"Callback": [
251512212
]
}
]

60
bin/json/game_tdreward.json
View File

@ -14,7 +14,15 @@
"t": "10000001",
"n": 1
}
]
],
"describe": {
"key": "td_reward_describe_1",
"text": "第一关描述"
},
"monstershow": {
"key": "td_reward_monstershow_1",
"text": "会出现敌人：<br>普通豚鼠：最基础敌人。<br>铁甲豚鼠：有铁甲技能。"
}
},
{
"id": 2,
@ -31,7 +39,15 @@
"t": "10000001",
"n": 2
}
]
],
"describe": {
"key": "td_reward_describe_2",
"text": "第一关描述"
},
"monstershow": {
"key": "td_reward_monstershow_2",
"text": "会出现敌人：<br>普通豚鼠：最基础敌人。<br>铁甲豚鼠：有铁甲技能。"
}
},
{
"id": 3,
@ -48,7 +64,15 @@
"t": "10000001",
"n": 3
}
]
],
"describe": {
"key": "td_reward_describe_3",
"text": "第一关描述"
},
"monstershow": {
"key": "td_reward_monstershow_3",
"text": "会出现敌人：<br>普通豚鼠：最基础敌人。<br>铁甲豚鼠：有铁甲技能。"
}
},
{
"id": 4,
@ -65,7 +89,15 @@
"t": "10000001",
"n": 4
}
]
],
"describe": {
"key": "td_reward_describe_4",
"text": "第一关描述"
},
"monstershow": {
"key": "td_reward_monstershow_4",
"text": "会出现敌人：<br>普通豚鼠：最基础敌人。<br>铁甲豚鼠：有铁甲技能。"
}
},
{
"id": 5,
@ -82,7 +114,15 @@
"t": "10000001",
"n": 5
}
]
],
"describe": {
"key": "td_reward_describe_5",
"text": "第一关描述"
},
"monstershow": {
"key": "td_reward_monstershow_5",
"text": "会出现敌人：<br>普通豚鼠：最基础敌人。<br>铁甲豚鼠：有铁甲技能。"
}
},
{
"id": 6,
@ -99,6 +139,14 @@
"t": "10000001",
"n": 6
}
]
],
"describe": {
"key": "td_reward_describe_6",
"text": "第一关描述"
},
"monstershow": {
"key": "td_reward_monstershow_6",
"text": "会出现敌人：<br>普通豚鼠：最基础敌人。<br>铁甲豚鼠：有铁甲技能。"
}
}
]

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)

1
modules/integral/api_challenge.go
View File

@ -50,6 +50,7 @@ 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_integral,

58
modules/integral/comp_configure.go
View File

@ -25,6 +25,7 @@ type configureComp struct {
module *Integral
boss map[int32]*cfg.GameIntegralBossData
reward map[int32][]*cfg.GameIntegralRewardData
task map[int32]*cfg.GameIntegralConditionData
}
//组件初始化接口
@ -33,9 +34,11 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
this.module = module.(*Integral)
err = this.LoadMultiConfigure(map[string]interface{}{
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
}
@ -103,7 +106,6 @@ func (this *configureComp) GetIntegralITime() (sz []*cfg.GameIntegralTimeData) {
return
}
func (this *configureComp) LoadIntegralReward() {
if v, err := this.GetConfigure(game_integralreward); err == nil {
@ -121,6 +123,7 @@ func (this *configureComp) LoadIntegralReward() {
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
@ -133,3 +136,56 @@ func (this *configureComp) GetIntegralReward(hid int32, itype int32) (result []*
}
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) // 入库

2
sys/configure/structs/Game.CatchbugRewardData.go
View File

@ -12,6 +12,7 @@ import "errors"
type GameCatchbugRewardData struct {
Key int32
Type int32
Condition int32
Reward []*Gameatn
}
@ -24,6 +25,7 @@ func (*GameCatchbugRewardData) GetTypeId() int32 {
func (_v *GameCatchbugRewardData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["condition"].(float64); !_ok_ { err = errors.New("condition error"); return }; _v.Condition = int32(_tempNum_) }
{
var _arr_ []interface{}

15
sys/configure/structs/Game.CatchbugStageData.go
View File

@ -21,6 +21,7 @@ type GameCatchbugStageData struct {
Stagedetail string
Stageskill string
Points int32
Consume []*Gameatn
}
const TypeId_GameCatchbugStageData = -494646541
@ -92,6 +93,20 @@ func (_v *GameCatchbugStageData)Deserialize(_buf map[string]interface{}) (err er
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["stagedetail"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Stagedetail error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Stagedetail, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["stageskill"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Stageskill error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Stageskill, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["points"].(float64); !_ok_ { err = errors.New("points error"); return }; _v.Points = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["consume"].([]interface{}); !_ok_ { err = errors.New("consume error"); return }
_v.Consume = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ *Gameatn
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Consume = append(_v.Consume, _list_v_)
}
}
return
}

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

42
sys/configure/structs/Game.Restore.go Normal file
View File

@ -0,0 +1,42 @@
//------------------------------------------------------------------------------
// <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
type GameRestore struct {
_dataMap map[int32]*GameRestoreData
_dataList []*GameRestoreData
}
func NewGameRestore(_buf []map[string]interface{}) (*GameRestore, error) {
_dataList := make([]*GameRestoreData, 0, len(_buf))
dataMap := make(map[int32]*GameRestoreData)
for _, _ele_ := range _buf {
if _v, err2 := DeserializeGameRestoreData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Key] = _v
}
}
return &GameRestore{_dataList:_dataList, _dataMap:dataMap}, nil
}
func (table *GameRestore) GetDataMap() map[int32]*GameRestoreData {
return table._dataMap
}
func (table *GameRestore) GetDataList() []*GameRestoreData {
return table._dataList
}
func (table *GameRestore) Get(key int32) *GameRestoreData {
return table._dataMap[key]
}

54
sys/configure/structs/Game.RestoreData.go Normal file
View File

@ -0,0 +1,54 @@
//------------------------------------------------------------------------------
// <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
import "errors"
type GameRestoreData struct {
Key int32
Tpye int32
Cycle int32
Maximums []*Gameatn
}
const TypeId_GameRestoreData = -1179593892
func (*GameRestoreData) GetTypeId() int32 {
return -1179593892
}
func (_v *GameRestoreData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["tpye"].(float64); !_ok_ { err = errors.New("tpye error"); return }; _v.Tpye = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cycle"].(float64); !_ok_ { err = errors.New("cycle error"); return }; _v.Cycle = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["maximums"].([]interface{}); !_ok_ { err = errors.New("maximums error"); return }
_v.Maximums = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ *Gameatn
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Maximums = append(_v.Maximums, _list_v_)
}
}
return
}
func DeserializeGameRestoreData(_buf map[string]interface{}) (*GameRestoreData, error) {
v := &GameRestoreData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
}

23
sys/configure/structs/Game.SkillFlagType.go Normal file
View File

@ -0,0 +1,23 @@
//------------------------------------------------------------------------------
// <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 (
GameSkillFlagType_None = 0
GameSkillFlagType_Normal = 1
GameSkillFlagType_Passivity = 2
GameSkillFlagType_Active = 3
GameSkillFlagType_Anger = 4
GameSkillFlagType_Single = 5
GameSkillFlagType_AOE = 6
GameSkillFlagType_Control = 7
GameSkillFlagType_Tre = 8
GameSkillFlagType_Debuff = 9
GameSkillFlagType_Buff = 10
)

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

@ -14,6 +14,8 @@ type GameTDRewardData struct {
Id int32
Reward []*Gameatn
Firstreward []*Gameatn
Describe string
Monstershow string
}
const TypeId_GameTDRewardData = 8107621
@ -52,6 +54,8 @@ func (_v *GameTDRewardData)Deserialize(_buf map[string]interface{}) (err error)
}
}
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["describe"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Describe error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Describe, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["monstershow"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Monstershow error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Monstershow, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
return
}

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
)

7
sys/configure/structs/Tables.go
View File

@ -319,6 +319,7 @@ type Tables struct {
IntegralReward *GameIntegralReward
IntegralCondition *GameIntegralCondition
IntegralTime *GameIntegralTime
Restore *GameRestore
}
func NewTables(loader JsonLoader) (*Tables, error) {
@ -2174,5 +2175,11 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.IntegralTime, err = NewGameIntegralTime(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_restore") ; err != nil {
return nil, err
}
if tables.Restore, err = NewGameRestore(buf) ; err != nil {
return nil, err
}
return tables, nil
}

4
sys/configure/structs/game.skillAtkData.go
View File

@ -15,6 +15,8 @@ type GameSkillAtkData struct {
Level int32
MaxLV int32
UnavailablePlayTypes []int32
SkillFlag int32
EffectFlag int32
Name string
Ico string
CorrectPos int32
@ -55,6 +57,8 @@ func (_v *GameSkillAtkData)Deserialize(_buf map[string]interface{}) (err error)
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["SkillFlag"].(float64); !_ok_ { err = errors.New("SkillFlag error"); return }; _v.SkillFlag = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["EffectFlag"].(float64); !_ok_ { err = errors.New("EffectFlag error"); return }; _v.EffectFlag = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["Name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; if _v.Ico, _ok_ = _buf["ico"].(string); !_ok_ { err = errors.New("ico error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["CorrectPos"].(float64); !_ok_ { err = errors.New("CorrectPos error"); return }; _v.CorrectPos = int32(_tempNum_) }