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

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

Browse Source
This commit is contained in:
meixiongfeng 2023-09-05 16:21:58 +08:00
commit ddc9d6d1e3
17 changed files with 1417 additions and 539 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/json/game_buriedcondi.json
View File

@ -21391,7 +21391,7 @@
"key": "buried_buried_condi_tasktxt_753",
"text": "恢复铁匠铺监控"
},
"type": 70,
"type": 20001,
"valid": 0,
"head": {
"a": "attr",
@ -21401,7 +21401,7 @@
"NPC": 10295,
"value": 1,
"filter": [
111
10500
],
"filter2": [
"通关的关卡ID",

7
bin/json/game_buriedtype.json
View File

@ -1354,5 +1354,12 @@
"filter": [
"eq"
]
},
{
"id": 233,
"insert": 1,
"filter": [
"eq"
]
}
]

12
bin/json/game_buzkashilv.json
View File

@ -1,32 +1,32 @@
[
{
"num": 1,
"score": "c",
"score": "gh_img_c",
"value": 10
},
{
"num": 2,
"score": "b",
"score": "gh_img_b",
"value": 20
},
{
"num": 3,
"score": "a",
"score": "gh_img_a",
"value": 50
},
{
"num": 4,
"score": "s",
"score": "gh_img_s",
"value": 80
},
{
"num": 5,
"score": "ss",
"score": "gh_img_ss",
"value": 100
},
{
"num": 6,
"score": "sss",
"score": "gh_img_sss",
"value": 120
}
]

4
bin/json/game_global.json
View File

@ -740,7 +740,9 @@
"buzkashi_sendtime": 1000,
"buzkashi_speedbumptime": 3000,
"buzkashi_speedbumphp": 1,
"buzkashi_sprintbumpscore": 10,
"buzkashi_sprintbumpscore": 5,
"buzkashi_goalscore": 5,
"buzkashi_goalteamscore": 10,
"buzkashi_bumpdis": 5,
"buzkashi_recovertime": 2000,
"buzkashi_recoverHp": 1,

360
bin/json/game_mainboss.json
View File

File diff suppressed because it is too large Load Diff

74
bin/json/game_mainchapter.json
View File

@ -37,7 +37,11 @@
},
"starreward": 11001,
"exploreward": 11001,
"bosspro": 1000
"bosspro": 1000,
"models": [
25001
],
"bosspng": "mainboss1"
},
{
"id": 11002,
@ -77,7 +81,11 @@
},
"starreward": 11002,
"exploreward": 11002,
"bosspro": 2000
"bosspro": 2000,
"models": [
25001
],
"bosspng": "mainboss1"
},
{
"id": 11003,
@ -117,7 +125,11 @@
},
"starreward": 11003,
"exploreward": 11003,
"bosspro": 3000
"bosspro": 3000,
"models": [
25001
],
"bosspng": "mainboss1"
},
{
"id": 11004,
@ -145,7 +157,7 @@
"text": "杜洛克王国"
},
"chapter_type": 1,
"map": "scenes_chapter_01",
"map": "scenes_chapter_04",
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_4",
@ -157,7 +169,11 @@
},
"starreward": 11004,
"exploreward": 11004,
"bosspro": 4000
"bosspro": 4000,
"models": [
25001
],
"bosspng": "mainboss1"
},
{
"id": 11005,
@ -197,7 +213,11 @@
},
"starreward": 11005,
"exploreward": 11005,
"bosspro": 5000
"bosspro": 5000,
"models": [
25001
],
"bosspng": "mainboss1"
},
{
"id": 11006,
@ -237,7 +257,11 @@
},
"starreward": 11006,
"exploreward": 11006,
"bosspro": 6000
"bosspro": 6000,
"models": [
25001
],
"bosspng": "mainboss1"
},
{
"id": 11007,
@ -277,7 +301,11 @@
},
"starreward": 11007,
"exploreward": 11007,
"bosspro": 7000
"bosspro": 7000,
"models": [
25001
],
"bosspng": "mainboss1"
},
{
"id": 11008,
@ -317,7 +345,11 @@
},
"starreward": 11008,
"exploreward": 11008,
"bosspro": 8000
"bosspro": 8000,
"models": [
25001
],
"bosspng": "mainboss1"
},
{
"id": 11009,
@ -357,7 +389,11 @@
},
"starreward": 11009,
"exploreward": 11009,
"bosspro": 9000
"bosspro": 9000,
"models": [
25001
],
"bosspng": "mainboss1"
},
{
"id": 11010,
@ -397,7 +433,11 @@
},
"starreward": 11010,
"exploreward": 11010,
"bosspro": 10000
"bosspro": 10000,
"models": [
25001
],
"bosspng": "mainboss1"
},
{
"id": 11011,
@ -437,7 +477,11 @@
},
"starreward": 11011,
"exploreward": 11011,
"bosspro": 11000
"bosspro": 11000,
"models": [
25001
],
"bosspng": "mainboss1"
},
{
"id": 11012,
@ -477,6 +521,10 @@
},
"starreward": 11012,
"exploreward": 11012,
"bosspro": 12000
"bosspro": 12000,
"models": [
25001
],
"bosspng": "mainboss1"
}
]

454
bin/json/game_mainstage.json
View File

File diff suppressed because it is too large Load Diff

4
bin/json/game_rdtasknpc.json
View File

@ -8078,7 +8078,7 @@
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"SmithyScene",
"打造",
"139"
],
@ -8212,7 +8212,7 @@
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"CommandScene",
"功能入口_主线",
"905"
],

555
bin/json/game_skillafteratk.json
View File

@ -6787,9 +6787,7 @@
"Id": 215005314,
"EmitPR": 1000,
"From": 1,
"Where": [
"EnemyHasBuff=1"
],
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
@ -6804,9 +6802,9 @@
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsRevisiType": 300,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiCondition": "EnemyNoBuff=1",
"RevisiParams": []
},
{
@ -52382,53 +52380,6 @@
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 934002313,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
391000042,
1000,
1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 934002314,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 8,
"Argu": [
1,
2,
1000
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 824005211,
"EmitPR": 1000,
@ -55407,6 +55358,30 @@
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 924003314,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
492400331,
-1,
-1,
1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 934006311,
"EmitPR": 1000,
@ -55786,6 +55761,30 @@
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 913002112,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
491300211,
-1,
-1,
1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 913002311,
"EmitPR": 1000,
@ -56013,9 +56012,9 @@
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsRevisiType": 300,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiCondition": "EnemyHasBuff=1",
"RevisiParams": []
},
{
@ -56043,6 +56042,29 @@
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 915005315,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
491500532,
-1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 915004311,
"EmitPR": 1000,
@ -56069,8 +56091,31 @@
},
{
"Id": 915004312,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
491500431,
-1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 915004313,
"EmitPR": 500,
"From": 2,
"From": 12,
"Where": [],
"Order": "",
"Limit": 10,
@ -56092,7 +56137,7 @@
"RevisiParams": []
},
{
"Id": 915004313,
"Id": 915004314,
"EmitPR": 1000,
"From": 2,
"Where": [],
@ -56117,6 +56162,29 @@
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 915004315,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
491500432,
-1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 924002311,
"EmitPR": 1000,
@ -56189,6 +56257,29 @@
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 924002314,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
492400231,
-1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 914007311,
"EmitPR": 1000,
@ -56223,7 +56314,7 @@
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
414007211,
491400731,
-1,
-1
],
@ -56270,7 +56361,7 @@
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
414007211,
491400732,
-1,
-1
],
@ -56635,6 +56726,29 @@
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 913003317,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
491300331,
-1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 935005311,
"EmitPR": 1000,
@ -57202,6 +57316,52 @@
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 924004314,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
492400431,
-1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 924004315,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
492400432,
-1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 943002311,
"EmitPR": 1000,
@ -57388,6 +57548,53 @@
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 934002313,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
391000042,
1000,
1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 934002314,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 8,
"Argu": [
1,
2,
1000
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 924005311,
"EmitPR": 1000,
@ -57458,6 +57665,29 @@
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 924005314,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
492400531,
-1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 913004311,
"EmitPR": 1000,
@ -58242,6 +58472,29 @@
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 913001317,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
491300141,
-1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 914005311,
"EmitPR": 1000,
@ -58431,6 +58684,29 @@
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 933001314,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
493300131,
-1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 943003311,
"EmitPR": 1000,
@ -58779,6 +59055,29 @@
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 913005316,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
491300533,
-1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 924009311,
"EmitPR": 1000,
@ -58943,6 +59242,52 @@
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 924001314,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
492400131,
-1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 924001315,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
492400132,
-1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 933002311,
"EmitPR": 1000,
@ -59089,7 +59434,7 @@
{
"Id": 914008314,
"EmitPR": 1000,
"From": 8,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
@ -59178,6 +59523,29 @@
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 923004314,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
492300431,
-1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 915003311,
"EmitPR": 1000,
@ -59247,6 +59615,52 @@
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 915003314,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
491500331,
-1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 915003315,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
491500332,
-1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 923003311,
"EmitPR": 1000,
@ -59321,6 +59735,29 @@
{
"Id": 923003314,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
492300332,
-1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 923003315,
"EmitPR": 1000,
"From": 1,
"Where": [],
"Order": "",

36
bin/json/game_skillatk.json
View File

@ -37579,7 +37579,7 @@
"Target": 0,
"ChildSkill": {
"Id": [
913001316
913001317
]
},
"passSkill": [],
@ -37759,7 +37759,7 @@
"Target": 0,
"ChildSkill": {
"Id": [
913002111
913002112
]
},
"passSkill": [],
@ -37939,7 +37939,7 @@
"Target": 0,
"ChildSkill": {
"Id": [
913003315
913003317
]
},
"passSkill": [],
@ -38059,7 +38059,7 @@
"Target": 0,
"ChildSkill": {
"Id": [
813004215
913004311
]
},
"passSkill": [],
@ -38270,7 +38270,7 @@
"Target": 0,
"ChildSkill": {
"Id": [
913005313
913005316
]
},
"passSkill": [],
@ -38303,9 +38303,7 @@
913005314
]
},
"passSkill": [
913005314
],
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_913005433_1",
"text": "3技能添加攻击提升时若目标身上已有攻击提升效果，减少目标所有技能冷却1回合"
@ -39352,7 +39350,7 @@
"Target": 0,
"ChildSkill": {
"Id": [
915003312
915003314
]
},
"passSkill": [],
@ -39382,7 +39380,7 @@
"Target": 0,
"ChildSkill": {
"Id": [
915003313
915003315
]
},
"passSkill": [],
@ -39562,7 +39560,7 @@
"Target": 0,
"ChildSkill": {
"Id": [
915004313
915004315
]
},
"passSkill": [],
@ -39742,7 +39740,7 @@
"Target": 0,
"ChildSkill": {
"Id": [
915005314
915005315
]
},
"passSkill": [],
@ -40252,7 +40250,7 @@
"Target": 0,
"ChildSkill": {
"Id": [
924001312
924001314
]
},
"passSkill": [],
@ -40282,7 +40280,7 @@
"Target": 0,
"ChildSkill": {
"Id": [
924001313
924001315
]
},
"passSkill": [],
@ -40462,7 +40460,7 @@
"Target": 0,
"ChildSkill": {
"Id": [
924002313
924002314
]
},
"passSkill": [],
@ -40642,7 +40640,7 @@
"Target": 0,
"ChildSkill": {
"Id": [
924003313
924003314
]
},
"passSkill": [],
@ -40792,7 +40790,7 @@
"Target": 0,
"ChildSkill": {
"Id": [
924004312
924004314
]
},
"passSkill": [],
@ -40822,7 +40820,7 @@
"Target": 0,
"ChildSkill": {
"Id": [
924004313
924004315
]
},
"passSkill": [],
@ -41003,7 +41001,7 @@
"Target": 0,
"ChildSkill": {
"Id": [
924005313
924005314
]
},
"passSkill": [],

4
bin/json/game_skillbuff.json
View File

@ -3549,9 +3549,9 @@
"OverlayTimes": 0,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffIcon": "ty_icon_buff_sl",
"buffeffect": "",
"buffpos": "",
"buffpos": "根节点",
"forbidFloat": 0
},
{

413
bin/json/game_skillpassive.json
View File

@ -4090,7 +4090,7 @@
"When": 16,
"FromCheck": "",
"TargetCheck": "Target=3",
"MainSkillCheck": "SkillPose=3",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
@ -4110,7 +4110,7 @@
"When": 16,
"FromCheck": "",
"TargetCheck": "Target=3",
"MainSkillCheck": "SkillPose=3",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
@ -7225,7 +7225,7 @@
"When": 2,
"FromCheck": "Target=3,Hpproless=500",
"TargetCheck": "",
"MainSkillCheck": "MainSkillID=125001311",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
@ -7240,6 +7240,26 @@
225004115
]
},
{
"Id": 491300141,
"When": 16,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 1,
"Callback": [
913001316
]
},
{
"Id": 491300311,
"When": 2,
@ -7366,7 +7386,7 @@
"When": 16,
"FromCheck": "Target=3",
"TargetCheck": "Target=2,NoBuff=3",
"MainSkillCheck": "MainSkillID=114005311",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
@ -7386,7 +7406,7 @@
"When": 16,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "MainSkillID=114005311",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
@ -7446,7 +7466,7 @@
"When": 19,
"FromCheck": "",
"TargetCheck": "Target=2,HasBuff=1",
"MainSkillCheck": "MainSkillID=1150025311",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
@ -7466,7 +7486,7 @@
"When": 16,
"FromCheck": "Target=3",
"TargetCheck": "Target=2",
"MainSkillCheck": "MainSkillID=1150025311",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
@ -7486,7 +7506,7 @@
"When": 17,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "MainSkillID=1150025311",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
@ -7506,8 +7526,8 @@
"When": 5,
"FromCheck": "Target=3",
"TargetCheck": "Target=2,NoBuff=1",
"MainSkillCheck": "",
"AfterSkillCheck": "SkillID=915005313",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
@ -7521,6 +7541,26 @@
915005313
]
},
{
"Id": 491500532,
"When": 5,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 0,
"Callback": [
915005314
]
},
{
"Id": 492300331,
"When": 7,
@ -7568,8 +7608,8 @@
"When": 10,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "SkillID=224009311",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
@ -7629,7 +7669,7 @@
"When": 16,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "MainSkillID=133002311",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
@ -7751,7 +7791,7 @@
"When": 4,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "MainSkillID=135004311",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
@ -8068,6 +8108,26 @@
213002212
]
},
{
"Id": 491300211,
"When": 16,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "SkillPos=1",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 99,
"Callback": [
913002111
]
},
{
"Id": 491400231,
"When": 16,
@ -8095,8 +8155,8 @@
"When": 20,
"FromCheck": "Target=3",
"TargetCheck": "Target=1",
"MainSkillCheck": "",
"AfterSkillCheck": "SkillID=213005311",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
@ -8109,5 +8169,326 @@
"Callback": [
913005312
]
},
{
"Id": 491300533,
"When": 20,
"FromCheck": "Target=3",
"TargetCheck": "Target=1",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 0,
"Callback": [
913005313
]
},
{
"Id": 491500431,
"When": 16,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 0,
"Callback": [
915004313
]
},
{
"Id": 491500432,
"When": 16,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 0,
"Callback": [
915004314
]
},
{
"Id": 492300332,
"When": 20,
"FromCheck": "Target=3",
"TargetCheck": "Target=1",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 0,
"Callback": [
923003315
]
},
{
"Id": 491300331,
"When": 16,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 0,
"Callback": [
913003315,
913003316
]
},
{
"Id": 491500331,
"When": 16,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 0,
"Callback": [
915003312
]
},
{
"Id": 491500332,
"When": 16,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 0,
"Callback": [
915003313
]
},
{
"Id": 492300431,
"When": 16,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 0,
"Callback": [
923004313
]
},
{
"Id": 492400131,
"When": 16,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 0,
"Callback": [
924001312
]
},
{
"Id": 492400132,
"When": 16,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 0,
"Callback": [
924001313
]
},
{
"Id": 492400231,
"When": 16,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 0,
"Callback": [
924002313
]
},
{
"Id": 492400331,
"When": 16,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 0,
"Callback": [
924003313
]
},
{
"Id": 492400431,
"When": 16,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 0,
"Callback": [
924004312
]
},
{
"Id": 492400432,
"When": 3,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 0,
"Callback": [
924004313
]
},
{
"Id": 492400531,
"When": 3,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 0,
"Callback": [
924005313
]
},
{
"Id": 493300131,
"When": 3,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 0,
"Callback": [
933001313
]
}
]

2
bin/json/game_worldall.json
View File

@ -100,7 +100,7 @@
"key": "worldtask_world_all_name_6",
"text": "功夫熊猫"
},
"task_icon": "rw_img",
"task_icon": "rw_img_ab",
"task_txt": {
"key": "",
"text": ""

4
modules/mainline/model_mainline.go
View File

@ -191,6 +191,10 @@ func (this *ModelMline) randomboos(data *pb.DBMainline) (err error) {
}
index = comm.GetRandW(weight)
if conf, err = this.module.configure.GetMainChapterConf(chapters[index]); err != nil {
return
}
data.Currboosmodel = conf.Models[comm.GetRandW(conf.Models)]
data.Currbooschapter = chapters[index]
data.Lastboosrefresh = configure.Now().Unix()
return

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

@ -13,7 +13,6 @@ import "errors"
type GameMainBossData struct {
Id int32
MonsterChapter int32
MonsterDisplayIp int32
MonsterStrength int32
Battlereadyid int32
FormatList []int32
@ -29,7 +28,6 @@ func (*GameMainBossData) GetTypeId() int32 {
func (_v *GameMainBossData)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["monster_chapter"].(float64); !_ok_ { err = errors.New("monster_chapter error"); return }; _v.MonsterChapter = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["MonsterDisplay_Ip"].(float64); !_ok_ { err = errors.New("MonsterDisplay_Ip error"); return }; _v.MonsterDisplayIp = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["monster_strength"].(float64); !_ok_ { err = errors.New("monster_strength error"); return }; _v.MonsterStrength = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["battlereadyid"].(float64); !_ok_ { err = errors.New("battlereadyid error"); return }; _v.Battlereadyid = int32(_tempNum_) }
{

17
sys/configure/structs/Game.MainChapterData.go
View File

@ -27,6 +27,8 @@ type GameMainChapterData struct {
Starreward int32
Exploreward int32
Bosspro int32
Models []int32
Bosspng string
}
const TypeId_GameMainChapterData = 2014963746
@ -52,6 +54,21 @@ func (_v *GameMainChapterData)Deserialize(_buf map[string]interface{}) (err erro
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["starreward"].(float64); !_ok_ { err = errors.New("starreward error"); return }; _v.Starreward = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["exploreward"].(float64); !_ok_ { err = errors.New("exploreward error"); return }; _v.Exploreward = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bosspro"].(float64); !_ok_ { err = errors.New("bosspro error"); return }; _v.Bosspro = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["models"].([]interface{}); !_ok_ { err = errors.New("models error"); return }
_v.Models = make([]int32, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ int32
{ var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
_v.Models = append(_v.Models, _list_v_)
}
}
{ var _ok_ bool; if _v.Bosspng, _ok_ = _buf["bosspng"].(string); !_ok_ { err = errors.New("bosspng error"); return } }
return
}

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

@ -246,6 +246,8 @@ type GameGlobalData struct {
BuzkashiSpeedbumptime int32
BuzkashiSpeedbumphp int32
BuzkashiSprintbumpscore int32
BuzkashiGoalscore int32
BuzkashiGoalteamscore int32
BuzkashiBumpdis float32
BuzkashiRecovertime int32
BuzkashiRecoverHp int32
@ -1009,6 +1011,8 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_speedbumptime"].(float64); !_ok_ { err = errors.New("buzkashi_speedbumptime error"); return }; _v.BuzkashiSpeedbumptime = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_speedbumphp"].(float64); !_ok_ { err = errors.New("buzkashi_speedbumphp error"); return }; _v.BuzkashiSpeedbumphp = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_sprintbumpscore"].(float64); !_ok_ { err = errors.New("buzkashi_sprintbumpscore error"); return }; _v.BuzkashiSprintbumpscore = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_goalscore"].(float64); !_ok_ { err = errors.New("buzkashi_goalscore error"); return }; _v.BuzkashiGoalscore = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_goalteamscore"].(float64); !_ok_ { err = errors.New("buzkashi_goalteamscore error"); return }; _v.BuzkashiGoalteamscore = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_bumpdis"].(float64); !_ok_ { err = errors.New("buzkashi_bumpdis error"); return }; _v.BuzkashiBumpdis = float32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_recovertime"].(float64); !_ok_ { err = errors.New("buzkashi_recovertime error"); return }; _v.BuzkashiRecovertime = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_recoverHp"].(float64); !_ok_ { err = errors.New("buzkashi_recoverHp error"); return }; _v.BuzkashiRecoverHp = int32(_tempNum_) }