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

三消排行结算

Browse Source
This commit is contained in:
meixiongfeng 2024-01-22 18:43:43 +08:00
parent 2c47ef9356
commit 6e8a7ca1f4
21 changed files with 1138 additions and 970 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
bin/json/game_battleready.json
View File

@ -3569,5 +3569,110 @@
"BlueAssistTeam": 0,
"CanFriendHelp": false,
"Numrounds": 60
},
{
"id": 301,
"PlayType": 11,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_02",
"battleScenes": [
"bossfight_naturetitan_03"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": false,
"HideFightUI": false,
"RuleTips": {
"key": "",
"text": ""
},
"BattleTips": {
"key": "",
"text": ""
},
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": false,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": true,
"Numrounds": 0
},
{
"id": 302,
"PlayType": 11,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_02",
"battleScenes": [
"bossfight_naturetitan_02"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": false,
"HideFightUI": false,
"RuleTips": {
"key": "",
"text": ""
},
"BattleTips": {
"key": "",
"text": ""
},
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": false,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": true,
"Numrounds": 0
},
{
"id": 303,
"PlayType": 11,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_02",
"battleScenes": [
"bossfight_naturetitan_01"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": false,
"HideFightUI": false,
"RuleTips": {
"key": "",
"text": ""
},
"BattleTips": {
"key": "",
"text": ""
},
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": false,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": true,
"Numrounds": 0
}
]

396
bin/json/game_battlescore.json
View File

@ -790,5 +790,401 @@
"rank_up": -1,
"grade": "gh_img_sss1",
"score": 22
},
{
"id": 4101,
"iType": 0,
"score_name": {
"key": "enchantboss_name_01",
"text": "F"
},
"rank_low": 0,
"rank_up": 30000,
"grade": "gh_img_f",
"score": 101
},
{
"id": 4101,
"iType": 0,
"score_name": {
"key": "enchantboss_name_02",
"text": "C"
},
"rank_low": 300001,
"rank_up": 600000,
"grade": "gh_img_c",
"score": 102
},
{
"id": 4101,
"iType": 0,
"score_name": {
"key": "enchantboss_name_03",
"text": "B"
},
"rank_low": 600001,
"rank_up": 700000,
"grade": "gh_img_b",
"score": 103
},
{
"id": 4101,
"iType": 0,
"score_name": {
"key": "enchantboss_name_04",
"text": "A"
},
"rank_low": 700001,
"rank_up": 800000,
"grade": "gh_img_a",
"score": 104
},
{
"id": 4101,
"iType": 0,
"score_name": {
"key": "enchantboss_name_05",
"text": "A+"
},
"rank_low": 800001,
"rank_up": 1000000,
"grade": "gh_img_a1",
"score": 105
},
{
"id": 4101,
"iType": 0,
"score_name": {
"key": "enchantboss_name_06",
"text": "S"
},
"rank_low": 1000001,
"rank_up": 2000000,
"grade": "gh_img_s",
"score": 106
},
{
"id": 4101,
"iType": 0,
"score_name": {
"key": "enchantboss_name_07",
"text": "SS"
},
"rank_low": 2000001,
"rank_up": 3000000,
"grade": "gh_img_ss",
"score": 107
},
{
"id": 4101,
"iType": 0,
"score_name": {
"key": "enchantboss_name_08",
"text": "SSS"
},
"rank_low": 3000001,
"rank_up": 4000000,
"grade": "gh_img_sss",
"score": 108
},
{
"id": 4101,
"iType": 0,
"score_name": {
"key": "enchantboss_name_09",
"text": "EX"
},
"rank_low": 4000001,
"rank_up": 5000000,
"grade": "gh_img_ex",
"score": 109
},
{
"id": 4101,
"iType": 0,
"score_name": {
"key": "enchantboss_name_10",
"text": "EX+"
},
"rank_low": 5000001,
"rank_up": 6666666,
"grade": "gh_img_ex1",
"score": 110
},
{
"id": 4101,
"iType": 0,
"score_name": {
"key": "enchantboss_name_11",
"text": "EX++"
},
"rank_low": 6666667,
"rank_up": 99999999,
"grade": "gh_img_ex2",
"score": 111
},
{
"id": 4201,
"iType": 0,
"score_name": {
"key": "enchantboss_name_01",
"text": "F"
},
"rank_low": 0,
"rank_up": 30000,
"grade": "gh_img_f",
"score": 201
},
{
"id": 4201,
"iType": 0,
"score_name": {
"key": "enchantboss_name_02",
"text": "C"
},
"rank_low": 300001,
"rank_up": 600000,
"grade": "gh_img_c",
"score": 202
},
{
"id": 4201,
"iType": 0,
"score_name": {
"key": "enchantboss_name_03",
"text": "B"
},
"rank_low": 600001,
"rank_up": 700000,
"grade": "gh_img_b",
"score": 203
},
{
"id": 4201,
"iType": 0,
"score_name": {
"key": "enchantboss_name_04",
"text": "A"
},
"rank_low": 700001,
"rank_up": 800000,
"grade": "gh_img_a",
"score": 204
},
{
"id": 4201,
"iType": 0,
"score_name": {
"key": "enchantboss_name_05",
"text": "A+"
},
"rank_low": 800001,
"rank_up": 1000000,
"grade": "gh_img_a1",
"score": 205
},
{
"id": 4201,
"iType": 0,
"score_name": {
"key": "enchantboss_name_06",
"text": "S"
},
"rank_low": 1000001,
"rank_up": 2000000,
"grade": "gh_img_s",
"score": 206
},
{
"id": 4201,
"iType": 0,
"score_name": {
"key": "enchantboss_name_07",
"text": "SS"
},
"rank_low": 2000001,
"rank_up": 3000000,
"grade": "gh_img_ss",
"score": 207
},
{
"id": 4201,
"iType": 0,
"score_name": {
"key": "enchantboss_name_08",
"text": "SSS"
},
"rank_low": 3000001,
"rank_up": 4000000,
"grade": "gh_img_sss",
"score": 208
},
{
"id": 4201,
"iType": 0,
"score_name": {
"key": "enchantboss_name_09",
"text": "EX"
},
"rank_low": 4000001,
"rank_up": 5000000,
"grade": "gh_img_ex",
"score": 209
},
{
"id": 4201,
"iType": 0,
"score_name": {
"key": "enchantboss_name_10",
"text": "EX+"
},
"rank_low": 5000001,
"rank_up": 6666666,
"grade": "gh_img_ex1",
"score": 210
},
{
"id": 4201,
"iType": 0,
"score_name": {
"key": "enchantboss_name_11",
"text": "EX++"
},
"rank_low": 6666667,
"rank_up": 99999999,
"grade": "gh_img_ex2",
"score": 211
},
{
"id": 4301,
"iType": 0,
"score_name": {
"key": "enchantboss_name_01",
"text": "F"
},
"rank_low": 0,
"rank_up": 30000,
"grade": "gh_img_f",
"score": 301
},
{
"id": 4301,
"iType": 0,
"score_name": {
"key": "enchantboss_name_02",
"text": "C"
},
"rank_low": 300001,
"rank_up": 600000,
"grade": "gh_img_c",
"score": 302
},
{
"id": 4301,
"iType": 0,
"score_name": {
"key": "enchantboss_name_03",
"text": "B"
},
"rank_low": 600001,
"rank_up": 700000,
"grade": "gh_img_b",
"score": 303
},
{
"id": 4301,
"iType": 0,
"score_name": {
"key": "enchantboss_name_04",
"text": "A"
},
"rank_low": 700001,
"rank_up": 800000,
"grade": "gh_img_a",
"score": 304
},
{
"id": 4301,
"iType": 0,
"score_name": {
"key": "enchantboss_name_05",
"text": "A+"
},
"rank_low": 800001,
"rank_up": 1000000,
"grade": "gh_img_a1",
"score": 305
},
{
"id": 4301,
"iType": 0,
"score_name": {
"key": "enchantboss_name_06",
"text": "S"
},
"rank_low": 1000001,
"rank_up": 2000000,
"grade": "gh_img_s",
"score": 306
},
{
"id": 4301,
"iType": 0,
"score_name": {
"key": "enchantboss_name_07",
"text": "SS"
},
"rank_low": 2000001,
"rank_up": 3000000,
"grade": "gh_img_ss",
"score": 307
},
{
"id": 4301,
"iType": 0,
"score_name": {
"key": "enchantboss_name_08",
"text": "SSS"
},
"rank_low": 3000001,
"rank_up": 4000000,
"grade": "gh_img_sss",
"score": 308
},
{
"id": 4301,
"iType": 0,
"score_name": {
"key": "enchantboss_name_09",
"text": "EX"
},
"rank_low": 4000001,
"rank_up": 5000000,
"grade": "gh_img_ex",
"score": 309
},
{
"id": 4301,
"iType": 0,
"score_name": {
"key": "enchantboss_name_10",
"text": "EX+"
},
"rank_low": 5000001,
"rank_up": 6666666,
"grade": "gh_img_ex1",
"score": 310
},
{
"id": 4301,
"iType": 0,
"score_name": {
"key": "enchantboss_name_11",
"text": "EX++"
},
"rank_low": 6666667,
"rank_up": 99999999,
"grade": "gh_img_ex2",
"score": 311
}
]

1014
bin/json/game_consumerank.json
View File

File diff suppressed because it is too large Load Diff

16
bin/json/game_fightingcapacity.json
View File

@ -1,34 +1,34 @@
[
{
"id": 3,
"id": 53,
"value": 100
},
{
"id": 4,
"id": 56,
"value": 1400
},
{
"id": 5,
"id": 59,
"value": 1400
},
{
"id": 6,
"id": 62,
"value": 13500
},
{
"id": 7,
"id": 65,
"value": 15500
},
{
"id": 8,
"id": 68,
"value": 11400
},
{
"id": 9,
"id": 71,
"value": 14000
},
{
"id": 10,
"id": 74,
"value": 14000
},
{

172
bin/json/game_hero.json
View File

@ -7051,6 +7051,178 @@
"text": "传说中的守护者“无牙仔”,拥有不俗的战斗能力"
}
},
{
"hid": "54006",
"name": {
"key": "hero_main_name_54006",
"text": "风里飞"
},
"star": 3,
"color": 2,
"race": 4,
"job": 1,
"type": 2,
"ip": 1,
"sd": 1,
"handbook": false,
"prefab": "54005",
"rotation": "0|0|0",
"revolve": 0,
"scale": [
1,
1,
1
],
"icon": "54005",
"vocal": "54005",
"tujing": [
107
],
"detailwindow": "effect_huaidanlianmeng_daiji",
"intr": {
"key": "",
"text": ""
},
"events": "hero_54005",
"cite": "",
"effectstay": [],
"hpspace": {
"x": 0,
"y": 0,
"z": 0
},
"capskillrule": 101,
"skill": 0,
"skill1": 154005111,
"skill2": 154005211,
"skill3": 0,
"skill4": 0,
"skill5": 0,
"skill6": 0,
"txt": {
"key": "atlas_54006",
"text": ""
},
"enteranivalue": 0,
"camerainterval": 0,
"equiprcom": [
1,
2,
10
],
"angle": 0,
"deviation": 0,
"show": 2,
"herofrag": [
{
"a": "item",
"t": "12025001",
"n": 1
}
],
"herofragnum": 6,
"heroskillup": [
"10000004"
],
"expitem": [
{
"a": "item",
"t": "10000011",
"n": 1
}
],
"expitemnum": 7,
"herointr": {
"key": "hero_main_herointr_54006",
"text": "传说中的守护者“风里飞”,拥有不俗的战斗能力"
}
},
{
"hid": "54007",
"name": {
"key": "hero_main_name_54007",
"text": "勾牙"
},
"star": 3,
"color": 2,
"race": 4,
"job": 1,
"type": 2,
"ip": 1,
"sd": 1,
"handbook": false,
"prefab": "54005",
"rotation": "0|0|0",
"revolve": 0,
"scale": [
1,
1,
1
],
"icon": "54005",
"vocal": "54005",
"tujing": [
107
],
"detailwindow": "effect_huaidanlianmeng_daiji",
"intr": {
"key": "",
"text": ""
},
"events": "hero_54005",
"cite": "",
"effectstay": [],
"hpspace": {
"x": 0,
"y": 0,
"z": 0
},
"capskillrule": 101,
"skill": 0,
"skill1": 154005111,
"skill2": 154005211,
"skill3": 0,
"skill4": 0,
"skill5": 0,
"skill6": 0,
"txt": {
"key": "atlas_54007",
"text": ""
},
"enteranivalue": 0,
"camerainterval": 0,
"equiprcom": [
1,
2,
10
],
"angle": 0,
"deviation": 0,
"show": 2,
"herofrag": [
{
"a": "item",
"t": "12025001",
"n": 1
}
],
"herofragnum": 6,
"heroskillup": [
"10000004"
],
"expitem": [
{
"a": "item",
"t": "10000011",
"n": 1
}
],
"expitemnum": 7,
"herointr": {
"key": "hero_main_herointr_54007",
"text": "传说中的守护者“勾牙”,拥有不俗的战斗能力"
}
},
{
"hid": "51010",
"name": {

8
bin/json/game_monsterformat.json
View File

@ -123776,12 +123776,12 @@
"newskill": [],
"lv": 65,
"hppro": 18,
"atkpro": 1.65,
"defpro": 0.5,
"atkpro": 1.7,
"defpro": 0.8,
"skill1": 1,
"skill2": 1,
"skill3": 1,
"speed": 145,
"speed": 155,
"modelsize": 1
},
{
@ -123801,7 +123801,7 @@
"skill1": 1,
"skill2": 1,
"skill3": 1,
"speed": 155,
"speed": 165,
"modelsize": 1
},
{

20
bin/json/game_skillatk.json
View File

@ -27547,7 +27547,7 @@
"key": "skill_skill_atk_Name_133005111",
"text": "维京武勇"
},
"ico": "jn_34003_1",
"ico": "jn_33005_1",
"CorrectPos": 0,
"IsMelee": 1,
"act": "Skill_1",
@ -27582,7 +27582,7 @@
"key": "skill_skill_atk_Name_133005111",
"text": "维京武勇"
},
"ico": "jn_34003_1",
"ico": "jn_33005_1",
"CorrectPos": 0,
"IsMelee": 1,
"act": "Skill_1",
@ -27617,7 +27617,7 @@
"key": "skill_skill_atk_Name_133005111",
"text": "维京武勇"
},
"ico": "jn_34003_1",
"ico": "jn_33005_1",
"CorrectPos": 0,
"IsMelee": 1,
"act": "Skill_1",
@ -27652,7 +27652,7 @@
"key": "skill_skill_atk_Name_133005111",
"text": "维京武勇"
},
"ico": "jn_34003_1",
"ico": "jn_33005_1",
"CorrectPos": 0,
"IsMelee": 1,
"act": "Skill_1",
@ -27687,7 +27687,7 @@
"key": "skill_skill_atk_Name_133005111",
"text": "维京武勇"
},
"ico": "jn_34003_1",
"ico": "jn_33005_1",
"CorrectPos": 0,
"IsMelee": 1,
"act": "Skill_1",
@ -27759,7 +27759,7 @@
"key": "skill_skill_atk_Name_133005311",
"text": "战无不胜"
},
"ico": "jn_34003_3",
"ico": "jn_33005_3",
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_3",
@ -27794,7 +27794,7 @@
"key": "skill_skill_atk_Name_133005311",
"text": "战无不胜"
},
"ico": "jn_34003_3",
"ico": "jn_33005_3",
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_3",
@ -27829,7 +27829,7 @@
"key": "skill_skill_atk_Name_133005311",
"text": "战无不胜"
},
"ico": "jn_34003_3",
"ico": "jn_33005_3",
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_3",
@ -27864,7 +27864,7 @@
"key": "skill_skill_atk_Name_133005311",
"text": "战无不胜"
},
"ico": "jn_34003_3",
"ico": "jn_33005_3",
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_3",
@ -27899,7 +27899,7 @@
"key": "skill_skill_atk_Name_133005311",
"text": "战无不胜"
},
"ico": "jn_34003_3",
"ico": "jn_33005_3",
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_3",

6
bin/json/game_skillpassive.json
View File

@ -13431,7 +13431,7 @@
"icon": "",
"When": 16,
"FromCheck": "Target=3",
"TargetCheck": "Target=2,HasBuff=391000116,OverlayNum=25",
"TargetCheck": "Target=2,BuffTotalOverlayNumLess=391000116,OverlayNum=25",
"MainSkillCheck": "SkillPos=5",
"AfterSkillCheck": "",
"BuffCheck": "",
@ -13457,7 +13457,7 @@
"icon": "",
"When": 16,
"FromCheck": "Target=3",
"TargetCheck": "Target=2,HasBuff=391000123,OverlayNum=25",
"TargetCheck": "Target=2,BuffTotalOverlayNumLess=391000123,OverlayNum=25",
"MainSkillCheck": "SkillPos=5",
"AfterSkillCheck": "",
"BuffCheck": "",
@ -13483,7 +13483,7 @@
"icon": "",
"When": 16,
"FromCheck": "Target=3",
"TargetCheck": "Target=2,HasBuff=391000127,OverlayNum=25",
"TargetCheck": "Target=2,BuffTotalOverlayNumLess=391000127,OverlayNum=25",
"MainSkillCheck": "SkillPos=5",
"AfterSkillCheck": "",
"BuffCheck": "",

41
bin/json/game_topuiconfig.json
View File

@ -557,6 +557,11 @@
"id": "recruit",
"subId": "2",
"currencyField": [
{
"a": "attr",
"t": "moongold",
"n": 1
},
{
"a": "item",
"t": "10000001",
@ -573,6 +578,11 @@
"id": "recruit",
"subId": "3",
"currencyField": [
{
"a": "attr",
"t": "moongold",
"n": 1
},
{
"a": "item",
"t": "10000021",
@ -589,6 +599,11 @@
"id": "recruit",
"subId": "4",
"currencyField": [
{
"a": "attr",
"t": "moongold",
"n": 1
},
{
"a": "item",
"t": "10000022",
@ -605,6 +620,11 @@
"id": "recruit",
"subId": "5",
"currencyField": [
{
"a": "attr",
"t": "moongold",
"n": 1
},
{
"a": "item",
"t": "10000023",
@ -621,6 +641,11 @@
"id": "recruit",
"subId": "6",
"currencyField": [
{
"a": "attr",
"t": "moongold",
"n": 1
},
{
"a": "item",
"t": "10000024",
@ -637,6 +662,11 @@
"id": "recruit",
"subId": "7",
"currencyField": [
{
"a": "attr",
"t": "moongold",
"n": 1
},
{
"a": "item",
"t": "10000024",
@ -3019,5 +3049,16 @@
"n": 1
}
]
},
{
"id": "moonLevelWindow",
"subId": "",
"currencyField": [
{
"a": "attr",
"t": "diamond",
"n": 1
}
]
}
]

190
bin/json/game_vikingrecommend.json
View File

@ -7,25 +7,25 @@
},
"recommendtype1": {
"key": "vikingexpedition_recommend_recommendtype1_1",
"text": "输出"
"text": "生存输出"
},
"herolist1": [
"25001",
"25001",
"25001",
"25001",
"25001"
"35001",
"15003",
"35005",
"14003",
"13004"
],
"recommendtype2": {
"key": "vikingexpedition_recommend_recommendtype2_1",
"text": "治疗"
"text": "生存治疗"
},
"herolist2": [
"25001",
"25001",
"25001",
"25001",
"25001"
"25004",
"15005",
"45003",
"43006",
"13004"
]
},
{
@ -36,25 +36,25 @@
},
"recommendtype1": {
"key": "vikingexpedition_recommend_recommendtype1_2",
"text": "单段输出"
"text": "多段输出"
},
"herolist1": [
"25001",
"25001",
"25001",
"25001",
"25001"
"15003",
"14003",
"35005",
"35002",
"14007"
],
"recommendtype2": {
"key": "vikingexpedition_recommend_recommendtype2_2",
"text": "净化"
"text": "辅助控制"
},
"herolist2": [
"25001",
"25001",
"25001",
"25001",
"25001"
"15005",
"45003",
"14007",
"24001",
"25004"
]
},
{
@ -65,25 +65,25 @@
},
"recommendtype1": {
"key": "vikingexpedition_recommend_recommendtype1_3",
"text": "多段输出"
"text": "单段输出"
},
"herolist1": [
"25001",
"25001",
"25001",
"25001",
"25001"
"44001",
"44006",
"24003",
"35001",
"24005"
],
"recommendtype2": {
"key": "vikingexpedition_recommend_recommendtype2_3",
"text": "治疗"
"text": "辅助净化"
},
"herolist2": [
"25001",
"25001",
"25001",
"25001",
"25001"
"24005",
"24003",
"15005",
"35001",
"13004"
]
},
{
@ -94,25 +94,25 @@
},
"recommendtype1": {
"key": "vikingexpedition_recommend_recommendtype1_4",
"text": "限制"
"text": "限制出手"
},
"herolist1": [
"25001",
"25001",
"25001",
"25001",
"25001"
"14003",
"44001",
"15004",
"24001",
"43002"
],
"recommendtype2": {
"key": "vikingexpedition_recommend_recommendtype2_4",
"text": "辅助"
"text": "辅助控制"
},
"herolist2": [
"25001",
"25001",
"25001",
"25001",
"25001"
"24005",
"43002",
"35006",
"24003",
"15005"
]
},
{
@ -123,25 +123,25 @@
},
"recommendtype1": {
"key": "vikingexpedition_recommend_recommendtype1_5",
"text": "爆发"
"text": "爆发输出"
},
"herolist1": [
"25001",
"25001",
"25001",
"25001",
"25001"
"44001",
"35001",
"35005",
"15003",
"35001"
],
"recommendtype2": {
"key": "vikingexpedition_recommend_recommendtype2_5",
"text": "禁疗"
"text": "辅助禁疗"
},
"herolist2": [
"25001",
"25001",
"25001",
"25001",
"25001"
"43004",
"35001",
"35006",
"35005",
"44001"
]
},
{
@ -155,22 +155,22 @@
"text": "无视防御"
},
"herolist1": [
"25001",
"25001",
"25001",
"25001",
"25001"
"35004",
"44001",
"35001",
"35005",
"15003"
],
"recommendtype2": {
"key": "vikingexpedition_recommend_recommendtype2_6",
"text": "中毒"
"text": "辅助中毒"
},
"herolist2": [
"25001",
"25001",
"25001",
"25001",
"25001"
"24002",
"13002",
"35005",
"15005",
"34005"
]
},
{
@ -181,25 +181,25 @@
},
"recommendtype1": {
"key": "vikingexpedition_recommend_recommendtype1_7",
"text": "中毒"
"text": "中毒输出"
},
"herolist1": [
"25001",
"25001",
"25001",
"25001",
"25001"
"34005",
"24002",
"13002",
"33003",
"35005"
],
"recommendtype2": {
"key": "vikingexpedition_recommend_recommendtype2_7",
"text": "治疗"
"text": "生存治疗"
},
"herolist2": [
"25001",
"25001",
"25001",
"25001",
"25001"
"15005",
"45003",
"43006",
"13004",
"25004"
]
},
{
@ -210,25 +210,25 @@
},
"recommendtype1": {
"key": "vikingexpedition_recommend_recommendtype1_8",
"text": "群体伤害"
"text": "群体爆发"
},
"herolist1": [
"25001",
"25001",
"25001",
"25001",
"25001"
"15004",
"35001",
"15003",
"35005",
"14003"
],
"recommendtype2": {
"key": "vikingexpedition_recommend_recommendtype2_8",
"text": "爆发"
"text": "控制输出"
},
"herolist2": [
"25001",
"25001",
"25001",
"25001",
"25001"
"14003",
"44001",
"24005",
"24003",
"15004"
]
}
]

2
comm/const.go
View File

@ -545,6 +545,8 @@ const ( //Rpc
RPC_GameinviteOffline core.Rpc_Key = "RPC_GameinviteOffline" // 游戏邀请离线通知
Rpc_ModuleVikingFigthEnd core.Rpc_Key = "Rpc_ModuleVikingFigthEnd" //维京远征结算
Rpc_ModuleXXlSettlement core.Rpc_Key = "Rpc_ModuleXXlSettlement" //三消比赛结算信息
)
// 事件类型定义处

17
modules/entertainment/configure.go
View File

@ -21,6 +21,7 @@ const (
game_playerskill = "game_playerskill.json"
game_passcheck = "game_passcheck.json"
game_consumetask = "game_consumetask.json"
consume_rank = "game_consumerank.json"
)
// /配置管理组件
@ -46,6 +47,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
consume_box: cfg.NewGameConsumeBox,
game_playerskill: cfg.NewGamePlayerSkill,
game_consumetask: cfg.NewGameConsumeTask,
consume_rank: cfg.NewGameConsumeRank,
})
configure.RegisterConfigure(game_block, cfg.NewGameBlock, this.LoadGameBlock)
configure.RegisterConfigure(game_passcheck, cfg.NewGamePassCheck, this.updatePassCheck)
@ -393,3 +395,18 @@ func (this *configureComp) loadConsumeIntegral() {
func (this *configureComp) GetConsumeResetIntegral() (score int32) {
return this.resetScore
}
//查询比赛奖励
func (this *configureComp) getRankReward() (result *cfg.GameConsumeRank, err error) {
var (
v interface{}
ok bool
)
if v, err = this.GetConfigure(consume_rank); err == nil {
if result, ok = v.(*cfg.GameConsumeRank); ok {
return
}
}
err = comm.NewNotFoundConfErr(moduleName, consume_rank, nil)
return
}

3
modules/entertainment/model.go
View File

@ -29,6 +29,9 @@ func (this *modelComp) Init(service core.IService, module core.IModule, comp cor
this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{
Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}},
})
this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{
Keys: bsonx.Doc{{Key: "consumeexp", Value: bsonx.Int32(1)}},
})
return
}

41
modules/entertainment/modelrank.go
View File

@ -8,6 +8,8 @@ import (
"go_dreamfactory/lego/sys/redis/pipe"
"go_dreamfactory/modules"
"go_dreamfactory/pb"
"go_dreamfactory/sys/configure"
cfg "go_dreamfactory/sys/configure/structs"
"github.com/go-redis/redis/v8"
)
@ -74,3 +76,42 @@ func (this *modelRank) queryRankUser() (ranks []string, err error) {
}
return
}
// 比赛结算
func (this *modelRank) raceSettlement() {
var (
reward *cfg.GameConsumeRank
result []string
Items []*pb.UserAssets
err error
)
if reward, err = this.module.configure.getRankReward(); err != nil {
this.module.Errorln(err)
return
}
for _, v := range reward.GetDataList() {
if result, err = this.DBModel.Redis.ZRevRange(fmt.Sprintf("%s-%s", this.DBModel.ServiceId, this.TableName), int64(v.RankLow-1), int64(v.RankUp)).Result(); err != nil {
this.module.Errorln(err)
return
}
Items = make([]*pb.UserAssets, len(v.RankReward))
for i, v := range v.RankReward {
Items[i] = &pb.UserAssets{
A: v.A,
T: v.T,
N: v.N,
}
}
for i := 0; i < len(result); i += 2 {
this.module.mail.SendNewMail(&pb.DBMailData{
Cid: "XXLRankingReward",
Param: []string{fmt.Sprintf("%d", v.RankLow+int32(i))},
CreateTime: uint64(configure.Now().Unix()),
Items: Items,
}, result[i])
}
}
}

17
modules/entertainment/module.go
View File

@ -29,6 +29,7 @@ type Entertainment struct {
match *matchComp
modelRank *modelRank
modelRecode *modelRecode
mail comm.Imail
}
// 模块名
@ -42,6 +43,8 @@ func (this *Entertainment) Init(service core.IService, module core.IModule, opti
return
}
this.service = service.(comm.IService)
this.service.RegisterFunctionName(string(comm.Rpc_ModuleXXlSettlement), this.Rpc_ModuleXXlSettlement)
return
}
@ -64,7 +67,11 @@ func (this *Entertainment) Start() (err error) {
}
event.RegisterGO(comm.EventUserOffline, this.EventUserOffline)
this.service.RegisterFunctionName(string(comm.RPC_XXLOffLine), this.useroffline)
var module core.IModule
if module, err = this.service.GetModule(comm.ModuleMail); err != nil {
return
}
this.mail = module.(comm.Imail)
// m := new(MapData)
// m.InitMap(this, 1)
// m.SetMap()
@ -370,3 +377,11 @@ func (this *Entertainment) GMAddConsumeexp(session comm.IUserSession, score int3
return
}
func (this *Entertainment) Rpc_ModuleXXlSettlement(ctx context.Context, args *pb.EmptyReq, reply *pb.EmptyResp) (err error) {
this.Debug("Rpc_ModuleXXlSettlement",
log.Field{Key: "args", Value: args.String()},
)
this.modelRank.raceSettlement()
return
}

1
modules/entertainment/room.go
View File

@ -645,6 +645,7 @@ func (this *Room) GameOver(winner *pb.PlayerData) (errdata *pb.ErrorData) {
}
}
}
bDestruction = true
}
go func() {
// 更新排行榜数据

34
modules/timer/caravanrank.go
View File

@ -7,12 +7,10 @@ import (
"go_dreamfactory/lego/core"
"go_dreamfactory/lego/core/cbase"
"go_dreamfactory/lego/sys/cron"
"go_dreamfactory/lego/sys/log"
"go_dreamfactory/lego/sys/timewheel"
"go_dreamfactory/modules"
"go_dreamfactory/pb"
"go_dreamfactory/sys/configure"
cfg "go_dreamfactory/sys/configure/structs"
"go_dreamfactory/sys/db"
"go_dreamfactory/utils"
)
@ -26,10 +24,6 @@ type CaravanRank struct {
cTimerObj *timewheel.Task
}
const (
game_global = "game_global.json" //全局配置表
)
//组件初始化接口
func (this *CaravanRank) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
@ -38,7 +32,6 @@ func (this *CaravanRank) Init(service core.IService, module core.IModule, comp c
this.module = module.(*Timer)
this.service = service.(base.IRPCXService)
err = this.LoadConfigure(game_global, cfg.NewGameGlobal)
return
}
func (this *CaravanRank) LoadConfigure(name string, fn interface{}) (err error) {
@ -50,23 +43,6 @@ func (this *CaravanRank) GetConfigure(name string) (v interface{}, err error) {
return configure.GetConfigure(name)
}
//全局配置
func (this *CaravanRank) GetGlobalConf() *cfg.GameGlobalData {
var (
configure *cfg.GameGlobal
ok bool
)
if v, err := this.GetConfigure(game_global); err != nil {
log.Errorf("get global conf err:%v", err)
return nil
} else {
if configure, ok = v.(*cfg.GameGlobal); !ok {
log.Errorf("%T no is *cfg.Game_global", v)
return nil
}
}
return configure.GetDataList()[0] // 返回对象信息
}
func (this *CaravanRank) Start() (err error) {
if db.IsCross() {
return
@ -95,5 +71,13 @@ func (this *CaravanRank) TimerSeason() {
); err != nil {
this.module.Errorln(err)
}
if err := this.service.RpcCall(
context.Background(),
comm.Service_Worker,
string(comm.Rpc_ModuleXXlSettlement),
pb.EmptyReq{},
nil,
); err != nil {
this.module.Errorln(err)
}
}

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

@ -11,4 +11,5 @@ package cfg
const (
GameBattleScoreType_Ordinary = 0
GameBattleScoreType_Coefficient = 1
GameBattleScoreType_EnchantBoss = 2
)

16
sys/configure/structs/Game.ConsumeRankData.go
View File

@ -12,8 +12,10 @@ import "errors"
type GameConsumeRankData struct {
Id int32
Group int32
Reward []*Gameatn
RankLow int32
RankUp int32
RankDisplay string
RankReward []*Gameatn
}
const TypeId_GameConsumeRankData = 1062948886
@ -24,18 +26,20 @@ func (*GameConsumeRankData) GetTypeId() int32 {
func (_v *GameConsumeRankData)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; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["group"].(float64); !_ok_ { err = errors.New("group error"); return }; _v.Group = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rank_low"].(float64); !_ok_ { err = errors.New("rank_low error"); return }; _v.RankLow = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rank_up"].(float64); !_ok_ { err = errors.New("rank_up error"); return }; _v.RankUp = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["rank_display"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.RankDisplay error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.RankDisplay, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["reward"].([]interface{}); !_ok_ { err = errors.New("reward error"); return }
if _arr_, _ok_ = _buf["rank_reward"].([]interface{}); !_ok_ { err = errors.New("rank_reward error"); return }
_v.Reward = make([]*Gameatn, 0, len(_arr_))
_v.RankReward = 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.Reward = append(_v.Reward, _list_v_)
_v.RankReward = append(_v.RankReward, _list_v_)
}
}

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

@ -44,4 +44,5 @@ const (
GameFightEventType_OnAddShieldEnd = 32
GameFightEventType_OnBuffEnd = 33
GameFightEventType_OnDrawActValue = 34
GameFightEventType_OnEnchantBossBuffChanged = 35
)

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

@ -344,7 +344,6 @@ type Tables struct {
FightingSkilllv *GameFightingSkilllv
FightingSkill *GameFightingSkill
FightingSkillStar *GameFightingSkillStar
ExpeditionBoos *GameExpeditionBoos
}
func NewTables(loader JsonLoader) (*Tables, error) {
@ -2350,11 +2349,5 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.FightingSkillStar, err = NewGameFightingSkillStar(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_expeditionboos") ; err != nil {
return nil, err
}
if tables.ExpeditionBoos, err = NewGameExpeditionBoos(buf) ; err != nil {
return nil, err
}
return tables, nil
}