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:
wh_zcy 2023-06-01 15:32:49 +08:00
commit c389cf463e
15 changed files with 3037 additions and 1544 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1660
bin/json/game_buriedcondi.json
View File

File diff suppressed because it is too large Load Diff

56
bin/json/game_itemlink.json
View File

@ -2,11 +2,11 @@
{ {
"id": 122, "id": 122,
"title": { "title": {
"key": "itemlink1_itemlink_title_1", "key": "itemlink_itemlink_title_4",
"text": "金币商店" "text": "金币商店"
}, },
"desc": { "desc": {
"key": "itemlink1_itemlink_desc_1", "key": "itemlink_itemlink_desc_4",
"text": "金币商店" "text": "金币商店"
}, },
"jumpid": 122, "jumpid": 122,
@ -15,11 +15,11 @@
{ {
"id": 123, "id": 123,
"title": { "title": {
"key": "itemlink1_itemlink_title_2", "key": "itemlink_itemlink_title_5",
"text": "钻石商店" "text": "钻石商店"
}, },
"desc": { "desc": {
"key": "itemlink1_itemlink_desc_2", "key": "itemlink_itemlink_desc_5",
"text": "钻石商店" "text": "钻石商店"
}, },
"jumpid": 123, "jumpid": 123,
@ -28,11 +28,11 @@
{ {
"id": 124, "id": 124,
"title": { "title": {
"key": "itemlink1_itemlink_title_3", "key": "itemlink_itemlink_title_6",
"text": "友情商店" "text": "友情商店"
}, },
"desc": { "desc": {
"key": "itemlink1_itemlink_desc_3", "key": "itemlink_itemlink_desc_6",
"text": "友情商店" "text": "友情商店"
}, },
"jumpid": 124, "jumpid": 124,
@ -41,11 +41,11 @@
{ {
"id": 125, "id": 125,
"title": { "title": {
"key": "itemlink1_itemlink_title_4", "key": "itemlink_itemlink_title_7",
"text": "竞技商店" "text": "竞技商店"
}, },
"desc": { "desc": {
"key": "itemlink1_itemlink_desc_4", "key": "itemlink_itemlink_desc_7",
"text": "竞技商店" "text": "竞技商店"
}, },
"jumpid": 125, "jumpid": 125,
@ -54,11 +54,11 @@
{ {
"id": 126, "id": 126,
"title": { "title": {
"key": "itemlink1_itemlink_title_5", "key": "itemlink_itemlink_title_8",
"text": "公会商店" "text": "公会商店"
}, },
"desc": { "desc": {
"key": "itemlink1_itemlink_desc_5", "key": "itemlink_itemlink_desc_8",
"text": "公会商店" "text": "公会商店"
}, },
"jumpid": 126, "jumpid": 126,
@ -67,11 +67,11 @@
{ {
"id": 1127, "id": 1127,
"title": { "title": {
"key": "itemlink1_itemlink_title_6", "key": "itemlink_itemlink_title_9",
"text": "特殊商店" "text": "特殊商店"
}, },
"desc": { "desc": {
"key": "itemlink1_itemlink_desc_6", "key": "itemlink_itemlink_desc_9",
"text": "特殊商店" "text": "特殊商店"
}, },
"jumpid": 1127, "jumpid": 1127,
@ -80,11 +80,11 @@
{ {
"id": 1128, "id": 1128,
"title": { "title": {
"key": "itemlink1_itemlink_title_7", "key": "itemlink_itemlink_title_10",
"text": "铁匠商店" "text": "铁匠商店"
}, },
"desc": { "desc": {
"key": "itemlink1_itemlink_desc_7", "key": "itemlink_itemlink_desc_10",
"text": "铁匠商店" "text": "铁匠商店"
}, },
"jumpid": 1128, "jumpid": 1128,
@ -93,11 +93,11 @@
{ {
"id": 158, "id": 158,
"title": { "title": {
"key": "itemlink1_itemlink_title_8", "key": "itemlink_itemlink_title_11",
"text": "充值钻石" "text": "充值钻石"
}, },
"desc": { "desc": {
"key": "itemlink1_itemlink_desc_8", "key": "itemlink_itemlink_desc_11",
"text": "充值钻石" "text": "充值钻石"
}, },
"jumpid": 158, "jumpid": 158,
@ -106,11 +106,11 @@
{ {
"id": 113, "id": 113,
"title": { "title": {
"key": "itemlink1_itemlink_title_9", "key": "itemlink_itemlink_title_12",
"text": "主线章节界面" "text": "主线章节界面"
}, },
"desc": { "desc": {
"key": "itemlink1_itemlink_desc_9", "key": "itemlink_itemlink_desc_12",
"text": "主线章节界面" "text": "主线章节界面"
}, },
"jumpid": 113, "jumpid": 113,
@ -119,11 +119,11 @@
{ {
"id": 115, "id": 115,
"title": { "title": {
"key": "itemlink1_itemlink_title_10", "key": "itemlink_itemlink_title_13",
"text": "好友列表" "text": "好友列表"
}, },
"desc": { "desc": {
"key": "itemlink1_itemlink_desc_10", "key": "itemlink_itemlink_desc_13",
"text": "好友列表" "text": "好友列表"
}, },
"jumpid": 115, "jumpid": 115,
@ -132,11 +132,11 @@
{ {
"id": 157, "id": 157,
"title": { "title": {
"key": "itemlink1_itemlink_title_11", "key": "itemlink_itemlink_title_14",
"text": "公会" "text": "公会"
}, },
"desc": { "desc": {
"key": "itemlink1_itemlink_desc_11", "key": "itemlink_itemlink_desc_14",
"text": "公会" "text": "公会"
}, },
"jumpid": 157, "jumpid": 157,
@ -145,11 +145,11 @@
{ {
"id": 156, "id": 156,
"title": { "title": {
"key": "itemlink1_itemlink_title_12", "key": "itemlink_itemlink_title_15",
"text": "竞技场" "text": "竞技场"
}, },
"desc": { "desc": {
"key": "itemlink1_itemlink_desc_12", "key": "itemlink_itemlink_desc_15",
"text": "竞技场" "text": "竞技场"
}, },
"jumpid": 156, "jumpid": 156,
@ -158,11 +158,11 @@
{ {
"id": 107, "id": 107,
"title": { "title": {
"key": "itemlink1_itemlink_title_13", "key": "itemlink_itemlink_title_16",
"text": "普通招募" "text": "普通招募"
}, },
"desc": { "desc": {
"key": "itemlink1_itemlink_desc_13", "key": "itemlink_itemlink_desc_16",
"text": "普通招募" "text": "普通招募"
}, },
"jumpid": 107, "jumpid": 107,
@ -171,11 +171,11 @@
{ {
"id": 165, "id": 165,
"title": { "title": {
"key": "itemlink1_itemlink_title_14", "key": "itemlink_itemlink_title_17",
"text": "前往vip" "text": "前往vip"
}, },
"desc": { "desc": {
"key": "itemlink1_itemlink_desc_14", "key": "itemlink_itemlink_desc_17",
"text": "前往vip" "text": "前往vip"
}, },
"jumpid": 165, "jumpid": 165,

8
bin/json/game_loading.json
View File

@ -2,7 +2,7 @@
{ {
"id": 1001, "id": 1001,
"scene": "GameMain", "scene": "GameMain",
"image": "loading_2", "image": "ld_mh_bg01",
"prompt": { "prompt": {
"key": "loading_Sheet1_prompt_1", "key": "loading_Sheet1_prompt_1",
"text": "中轴城是终极之战后重建的世界首都，靠先进技术串联幸存世界。" "text": "中轴城是终极之战后重建的世界首都，靠先进技术串联幸存世界。"
@ -11,7 +11,7 @@
{ {
"id": 1002, "id": 1002,
"scene": "CommandScene", "scene": "CommandScene",
"image": "ld_5v5_bg1", "image": "ld_mh_bg_zhb",
"prompt": { "prompt": {
"key": "loading_Sheet1_prompt_2", "key": "loading_Sheet1_prompt_2",
"text": "指挥部里储存着很多月光原石，看起来有大用处。" "text": "指挥部里储存着很多月光原石，看起来有大用处。"
@ -20,7 +20,7 @@
{ {
"id": 1003, "id": 1003,
"scene": "WuGuanScene", "scene": "WuGuanScene",
"image": "ld_boss_bg", "image": "ld_mh_bg_wg",
"prompt": { "prompt": {
"key": "loading_Sheet1_prompt_3", "key": "loading_Sheet1_prompt_3",
"text": "快跟着浣熊师父学功夫吧，争取像阿宝一样成为让世人尊敬的大侠。" "text": "快跟着浣熊师父学功夫吧，争取像阿宝一样成为让世人尊敬的大侠。"
@ -29,7 +29,7 @@
{ {
"id": 1004, "id": 1004,
"scene": "SmithyScene", "scene": "SmithyScene",
"image": "ld_5v5_bg", "image": "ld_mh_bg_tjp",
"prompt": { "prompt": {
"key": "loading_Sheet1_prompt_4", "key": "loading_Sheet1_prompt_4",
"text": "艺术家戈伯随时等你带着好酒好菜去找他打造装备哦。" "text": "艺术家戈伯随时等你带着好酒好菜去找他打造装备哦。"

17
bin/json/game_navigation.json
View File

@ -254,5 +254,22 @@
"木桩" "木桩"
], ],
"functionicon": "ty_qp_mz" "functionicon": "ty_qp_mz"
},
{
"Id": 17,
"scene": "GameMain",
"scenename": {
"key": "navigation_Sheet1_scenename_4",
"text": "中轴城"
},
"sceneicon": "ty_qp_my01",
"functionname": {
"key": "navigation_Sheet1_functionname_17",
"text": "羁绊"
},
"npcName": [
"功能入口-藏书馆"
],
"functionicon": "ty_qp_hgd"
} }
] ]

6
bin/json/game_playerinfor_overview.json
View File

@ -2,7 +2,7 @@
{ {
"id": "16010101", "id": "16010101",
"type": 1, "type": 1,
"icon": "sbkp_js_nz", "icon": "icon/sbkp_js_nz",
"tujing": [ "tujing": [
107 107
], ],
@ -18,7 +18,7 @@
{ {
"id": "16010201", "id": "16010201",
"type": 2, "type": 2,
"icon": "zj_dz_001", "icon": "icon/zj_dz_001",
"tujing": [ "tujing": [
107 107
], ],
@ -34,7 +34,7 @@
{ {
"id": "16010301", "id": "16010301",
"type": 3, "type": 3,
"icon": "zj_bg_xk", "icon": "protagonistsystem/zj_bg_xk",
"tujing": [ "tujing": [
107 107
], ],

267
bin/json/game_skillafteratk.json
View File

@ -16894,7 +16894,7 @@
{ {
"Id": 243001313, "Id": 243001313,
"EmitPR": 1000, "EmitPR": 1000,
"From": 2, "From": 9,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
@ -17844,14 +17844,15 @@
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 5, "Type": 5,
"Argu": [ "Argu": [
1, 2,
2, 2,
300 300
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [ "SucFollowSK": [
243006212, 243006212,
243006213 243006213,
243006214
], ],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
@ -17912,32 +17913,9 @@
"Id": 243006214, "Id": 243006214,
"EmitPR": 1000, "EmitPR": 1000,
"From": 1, "From": 1,
"Where": [], "Where": [
"Order": "", "EnemyHpproless=500"
"Limit": 1,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
443006211,
-1,
1
], ],
"FollowSK": [],
"SucFollowSK": [
243006215
],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 243006215,
"EmitPR": 1000,
"From": 1,
"Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
"ExecuteCnt": 1, "ExecuteCnt": 1,
@ -17987,7 +17965,7 @@
"From": 1, "From": 1,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 10,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 3, "Type": 3,
"Argu": [ "Argu": [
@ -18090,82 +18068,7 @@
"Argu": [ "Argu": [
413001211, 413001211,
-1, -1,
1 -1
],
"FollowSK": [],
"SucFollowSK": [
213001212,
213001213
],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 213001212,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
200
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 213001213,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 21,
"Argu": [
1,
5,
800
],
"FollowSK": [],
"SucFollowSK": [
213001214
],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 213001214,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001110,
600,
1,
2
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
@ -19273,9 +19176,7 @@
1, 1,
-1 -1
], ],
"FollowSK": [ "FollowSK": [],
215002212
],
"SucFollowSK": [], "SucFollowSK": [],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
@ -19296,7 +19197,7 @@
"Argu": [ "Argu": [
390001205, 390001205,
1000, 1000,
1, 2,
-1 -1
], ],
"FollowSK": [], "FollowSK": [],
@ -19322,9 +19223,7 @@
1, 1,
-1 -1
], ],
"FollowSK": [ "FollowSK": [],
215002214
],
"SucFollowSK": [], "SucFollowSK": [],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
@ -19525,8 +19424,8 @@
"Type": 2, "Type": 2,
"Argu": [ "Argu": [
413005211, 413005211,
1, -1,
1 -1
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
@ -19671,8 +19570,8 @@
"Type": 2, "Type": 2,
"Argu": [ "Argu": [
413005213, 413005213,
1, -1,
1 -1
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
@ -19767,8 +19666,8 @@
"Type": 2, "Type": 2,
"Argu": [ "Argu": [
424009011, 424009011,
1, -1,
1 -1
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
@ -19953,8 +19852,8 @@
"Type": 2, "Type": 2,
"Argu": [ "Argu": [
424009013, 424009013,
1, -1,
1 -1
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
@ -20050,9 +19949,7 @@
1, 1,
-1 -1
], ],
"FollowSK": [ "FollowSK": [],
224001113
],
"SucFollowSK": [], "SucFollowSK": [],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
@ -20094,11 +19991,11 @@
4, 4,
2100 2100
], ],
"FollowSK": [ "FollowSK": [],
"SucFollowSK": [
224001212, 224001212,
224001213 224001213
], ],
"SucFollowSK": [],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
"DpsRevisiType": 0, "DpsRevisiType": 0,
@ -20160,21 +20057,23 @@
"Argu": [ "Argu": [
1, 1,
4, 4,
750 1000
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
"DpsRevisiType": 0, "DpsRevisiType": 100,
"DpsCondition": "", "DpsCondition": "CriCal =1",
"RevisiCondition": "", "RevisiCondition": "",
"RevisiParams": [] "RevisiParams": [
300
]
}, },
{ {
"Id": 224001312, "Id": 224001312,
"EmitPR": 1000, "EmitPR": 1000,
"From": 3, "From": 2,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 10, "Limit": 10,
@ -20191,54 +20090,12 @@
"SucFollowSK": [], "SucFollowSK": [],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
"DpsRevisiType": 0, "DpsRevisiType": 100,
"DpsCondition": "", "DpsCondition": "CriCal =1",
"RevisiCondition": "", "RevisiCondition": "",
"RevisiParams": [] "RevisiParams": [
},
{
"Id": 224001313,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
424001111,
1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 224001314,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 20,
"Argu": [
300 300
], ]
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
}, },
{ {
"Id": 251006111, "Id": 251006111,
@ -20301,7 +20158,7 @@
"Argu": [ "Argu": [
1, 1,
4, 4,
300 900
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
@ -20491,7 +20348,7 @@
"Type": 2, "Type": 2,
"Argu": [ "Argu": [
433002211, 433002211,
1, -1,
-1 -1
], ],
"FollowSK": [], "FollowSK": [],
@ -20545,57 +20402,13 @@
"SucFollowSK": [], "SucFollowSK": [],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
"DpsRevisiType": 0, "DpsRevisiType": 105,
"DpsCondition": "", "DpsCondition": "",
"RevisiCondition": "", "RevisiCondition": "",
"RevisiParams": [] "RevisiParams": [
}, 3,
{ 200
"Id": 233002312, ]
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
433002211,
1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 233002313,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001411,
1000,
1,
1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
}, },
{ {
"Id": 255004111, "Id": 255004111,

1947
bin/json/game_skillatk.json
View File

File diff suppressed because it is too large Load Diff

555
bin/json/game_skillbuff.json
View File

File diff suppressed because it is too large Load Diff

24
bin/json/game_skillpassive.json
View File

@ -1064,9 +1064,9 @@
}, },
{ {
"Id": 413001211, "Id": 413001211,
"When": 2, "When": 16,
"FromCheck": "Target=2", "FromCheck": "Target=2",
"TargetCheck": "", "TargetCheck": "Target=1",
"MainSkillCheck": "", "MainSkillCheck": "",
"AfterSkillCheck": "", "AfterSkillCheck": "",
"BuffCheck": "", "BuffCheck": "",
@ -1074,7 +1074,7 @@
"FriendHpproless=500" "FriendHpproless=500"
], ],
"PasPr": 1000, "PasPr": 1000,
"Type": "CallSkillPas", "Type": "BeatBack",
"MaxEmitTimes": 1, "MaxEmitTimes": 1,
"Callback": [] "Callback": []
}, },
@ -1178,7 +1178,7 @@
"Id": 415002212, "Id": 415002212,
"When": 19, "When": 19,
"FromCheck": "Target=3", "FromCheck": "Target=3",
"TargetCheck": "Target=3", "TargetCheck": "Target=3,HasBuff=3",
"MainSkillCheck": "", "MainSkillCheck": "",
"AfterSkillCheck": "", "AfterSkillCheck": "",
"BuffCheck": "Effect=3,Succ=1", "BuffCheck": "Effect=3,Succ=1",
@ -1187,7 +1187,7 @@
"Type": "CallSkillPas", "Type": "CallSkillPas",
"MaxEmitTimes": 99, "MaxEmitTimes": 99,
"Callback": [ "Callback": [
235003215 215002214
] ]
}, },
{ {
@ -1290,7 +1290,7 @@
"Id": 413005212, "Id": 413005212,
"When": 3, "When": 3,
"FromCheck": "Target=3", "FromCheck": "Target=3",
"TargetCheck": "", "TargetCheck": "Target=1",
"MainSkillCheck": "", "MainSkillCheck": "",
"AfterSkillCheck": "", "AfterSkillCheck": "",
"BuffCheck": "", "BuffCheck": "",
@ -1342,8 +1342,8 @@
"Id": 424009012, "Id": 424009012,
"When": 10, "When": 10,
"FromCheck": "Target=3", "FromCheck": "Target=3",
"TargetCheck": "3", "TargetCheck": "",
"MainSkillCheck": "", "MainSkillCheck": "MainSkillID=124009211",
"AfterSkillCheck": "", "AfterSkillCheck": "",
"BuffCheck": "", "BuffCheck": "",
"AddCon": [], "AddCon": [],
@ -1358,8 +1358,8 @@
"Id": 424009013, "Id": 424009013,
"When": 10, "When": 10,
"FromCheck": "Target=3", "FromCheck": "Target=3",
"TargetCheck": "3", "TargetCheck": "",
"MainSkillCheck": "", "MainSkillCheck": "MainSkillID=124009311",
"AfterSkillCheck": "", "AfterSkillCheck": "",
"BuffCheck": "", "BuffCheck": "",
"AddCon": [], "AddCon": [],
@ -1406,8 +1406,8 @@
"Id": 433002211, "Id": 433002211,
"When": 10, "When": 10,
"FromCheck": "Target=3", "FromCheck": "Target=3",
"TargetCheck": "3", "TargetCheck": "",
"MainSkillCheck": "", "MainSkillCheck": "MainSkillID=133002211",
"AfterSkillCheck": "", "AfterSkillCheck": "",
"BuffCheck": "", "BuffCheck": "",
"AddCon": [], "AddCon": [],

4
modules/buried/module.go
View File

@ -99,7 +99,7 @@ func (this *Buried) ActiveCondition(uid string, condiIds ...int32) (err error) {
State: pb.BuriedItemState_Activated, State: pb.BuriedItemState_Activated,
Value: 0, Value: 0,
Statistics: make([]string, 0), Statistics: make([]string, 0),
Finish: pb.BuriedItemFinishState_unfinish, Finish: pb.BuriedItemFinishState_buried_unfinish,
Timestamp: time.Now().Unix(), Timestamp: time.Now().Unix(),
}) })
} }
@ -359,7 +359,7 @@ func (this *Buried) updateAndCheckBuried(bconf *cfg.GameBuriedTypeData, bdata *p
} }
if bitem.Value >= cond.Value { //完成进度 if bitem.Value >= cond.Value { //完成进度
bitem.Finish = pb.BuriedItemFinishState_finish bitem.Finish = pb.BuriedItemFinishState_buried_finish
if cond.Lock == autolock { //完成后自动锁定 if cond.Lock == autolock { //完成后自动锁定
bitem.State = pb.BuriedItemState_Freeze bitem.State = pb.BuriedItemState_Freeze
} }

4
modules/worldtask/api_accept.go
View File

@ -93,9 +93,9 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
if err == nil { if err == nil {
var unfinishCondIds []int32 var unfinishCondIds []int32
for _, cond := range conds { for _, cond := range conds {
if cond.State == pb.BuriedItemFinishState_finish { if cond.State == pb.BuriedItemFinishState_buried_finish {
rsp.CondiIds = append(rsp.CondiIds, cond.Conid) rsp.CondiIds = append(rsp.CondiIds, cond.Conid)
} else if cond.State == pb.BuriedItemFinishState_unfinish { } else if cond.State == pb.BuriedItemFinishState_buried_unfinish {
unfinishCondIds = append(unfinishCondIds, cond.Conid) unfinishCondIds = append(unfinishCondIds, cond.Conid)
} }
} }

2
modules/worldtask/api_completetask.go
View File

@ -52,7 +52,7 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC
data.Message = comm.NewExternalModuleErr("buried", "CheckCondition", uid, req.CondiId).Error() data.Message = comm.NewExternalModuleErr("buried", "CheckCondition", uid, req.CondiId).Error()
} }
for _, cond := range conds { for _, cond := range conds {
if cond.State == pb.BuriedItemFinishState_finish { if cond.State == pb.BuriedItemFinishState_buried_finish {
wt.CondiIds = append(wt.CondiIds, cond.Conid) wt.CondiIds = append(wt.CondiIds, cond.Conid)
} }
} }

4
modules/worldtask/api_finish.go
View File

@ -114,7 +114,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
return return
} }
for _, cond := range conds { for _, cond := range conds {
if cond.Conid == condId && cond.State == pb.BuriedItemFinishState_finish { if cond.Conid == condId && cond.State == pb.BuriedItemFinishState_buried_finish {
condiFlag = true condiFlag = true
} }
} }
@ -212,7 +212,7 @@ func (this *apiComp) updateCheckCond(uid string, userTask *pb.DBWorldtask, nextT
var condIds []int32 var condIds []int32
for _, cond := range conds { for _, cond := range conds {
if cond.State == pb.BuriedItemFinishState_finish { if cond.State == pb.BuriedItemFinishState_buried_finish {
condIds = append(condIds, cond.Conid) condIds = append(condIds, cond.Conid)
} }
} }

2
modules/worldtask/model_worldtask.go
View File

@ -214,7 +214,7 @@ func (this *ModelWorldtask) updateCurrentTaskCond(uid string, userLv int32, user
var condIds []int32 var condIds []int32
for _, cond := range conds { for _, cond := range conds {
if cond.State == pb.BuriedItemFinishState_finish { if cond.State == pb.BuriedItemFinishState_buried_finish {
condIds = append(condIds, cond.Conid) condIds = append(condIds, cond.Conid)
} }
} }

25
pb/buried_db.pb.go
View File

@ -77,19 +77,19 @@ func (BuriedItemState) EnumDescriptor() ([]byte, []int) {
type BuriedItemFinishState int32 type BuriedItemFinishState int32
const ( const (
BuriedItemFinishState_unfinish BuriedItemFinishState = 0 BuriedItemFinishState_buried_unfinish BuriedItemFinishState = 0
BuriedItemFinishState_finish BuriedItemFinishState = 1 BuriedItemFinishState_buried_finish BuriedItemFinishState = 1
) )
// Enum value maps for BuriedItemFinishState. // Enum value maps for BuriedItemFinishState.
var ( var (
BuriedItemFinishState_name = map[int32]string{ BuriedItemFinishState_name = map[int32]string{
0: "unfinish", 0: "buried_unfinish",
1: "finish", 1: "buried_finish",
} }
BuriedItemFinishState_value = map[string]int32{ BuriedItemFinishState_value = map[string]int32{
"unfinish": 0, "buried_unfinish": 0,
"finish": 1, "buried_finish": 1,
} }
) )
@ -198,7 +198,7 @@ func (x *DBBuriedConItem) GetFinish() BuriedItemFinishState {
if x != nil { if x != nil {
return x.Finish return x.Finish
} }
return BuriedItemFinishState_unfinish return BuriedItemFinishState_buried_unfinish
} }
func (x *DBBuriedConItem) GetTimestamp() int64 { func (x *DBBuriedConItem) GetTimestamp() int64 {
@ -474,7 +474,7 @@ func (x *ConIProgress) GetState() BuriedItemFinishState {
if x != nil { if x != nil {
return x.State return x.State
} }
return BuriedItemFinishState_unfinish return BuriedItemFinishState_buried_unfinish
} }
var File_buried_buried_db_proto protoreflect.FileDescriptor var File_buried_buried_db_proto protoreflect.FileDescriptor
@ -531,11 +531,12 @@ var file_buried_buried_db_proto_rawDesc = []byte{
0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x49, 0x6e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x49, 0x6e, 0x61, 0x63, 0x74, 0x69, 0x76,
0x61, 0x74, 0x65, 0x64, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x61, 0x74, 0x65, 0x64, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61,
0x74, 0x65, 0x64, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x46, 0x72, 0x65, 0x65, 0x7a, 0x65, 0x10, 0x74, 0x65, 0x64, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x46, 0x72, 0x65, 0x65, 0x7a, 0x65, 0x10,
0x02, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x6c, 0x65, 0x65, 0x70, 0x10, 0x03, 0x2a, 0x31, 0x0a, 0x15, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x6c, 0x65, 0x65, 0x70, 0x10, 0x03, 0x2a, 0x3f, 0x0a, 0x15,
0x42, 0x75, 0x72, 0x69, 0x65, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x42, 0x75, 0x72, 0x69, 0x65, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68,
0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0c, 0x0a, 0x08, 0x75, 0x6e, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x13, 0x0a, 0x0f, 0x62, 0x75, 0x72, 0x69, 0x65, 0x64, 0x5f,
0x68, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x10, 0x01, 0x42, 0x75, 0x6e, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x62, 0x75,
0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x72, 0x69, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x10, 0x01, 0x42, 0x06, 0x5a,
0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (