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

This commit is contained in:
meixiongfeng 2023-06-21 16:41:14 +08:00
commit fc4a8c7596
13 changed files with 56361 additions and 8607 deletions

View File

@ -19827,5 +19827,175 @@
"0",
"0"
]
},
{
"id": 50000001,
"rtype": 2,
"ctype": 3,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_846",
"text": "使用好友助战守护者1次"
},
"type": 12,
"valid": 0,
"NPC": 0,
"value": 1,
"filter": [],
"filter2": []
},
{
"id": 50000002,
"rtype": 2,
"ctype": 3,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_847",
"text": "进行3次普通招募"
},
"type": 18,
"valid": 0,
"NPC": 0,
"value": 3,
"filter": [],
"filter2": []
},
{
"id": 50000003,
"rtype": 2,
"ctype": 3,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_848",
"text": "为任意守护者提升5级"
},
"type": 24,
"valid": 0,
"NPC": 0,
"value": 5,
"filter": [],
"filter2": []
},
{
"id": 50000004,
"rtype": 2,
"ctype": 3,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_849",
"text": "强化任意装备成功6次"
},
"type": 47,
"valid": 0,
"NPC": 0,
"value": 6,
"filter": [],
"filter2": []
},
{
"id": 50000005,
"rtype": 2,
"ctype": 3,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_850",
"text": "消费500000金币"
},
"type": 68,
"valid": 0,
"NPC": 0,
"value": 500000,
"filter": [],
"filter2": []
},
{
"id": 50000006,
"rtype": 2,
"ctype": 3,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_851",
"text": "消费300钻石"
},
"type": 104,
"valid": 0,
"NPC": 0,
"value": 300,
"filter": [],
"filter2": []
},
{
"id": 50000007,
"rtype": 2,
"ctype": 3,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_852",
"text": "完成1次功夫陪练任务"
},
"type": 186,
"valid": 0,
"NPC": 0,
"value": 1,
"filter": [],
"filter2": []
},
{
"id": 50000008,
"rtype": 2,
"ctype": 3,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_853",
"text": "挑战3次竞技场"
},
"type": 130,
"valid": 0,
"NPC": 0,
"value": 3,
"filter": [],
"filter2": []
},
{
"id": 50000009,
"rtype": 2,
"ctype": 3,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_854",
"text": "挑战3次“维京远征”副本"
},
"type": 172,
"valid": 0,
"NPC": 0,
"value": 3,
"filter": [],
"filter2": []
},
{
"id": 50000010,
"rtype": 2,
"ctype": 3,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_855",
"text": "挑战3次“狩猎”副本"
},
"type": 200,
"valid": 0,
"NPC": 0,
"value": 3,
"filter": [],
"filter2": []
}
]

View File

@ -1138,5 +1138,10 @@
"filter": [
"eq"
]
},
{
"id": 200,
"insert": 2,
"filter": []
}
]

File diff suppressed because it is too large Load Diff

View File

@ -1,56 +1,56 @@
[
{
"id": 1,
"activity": 1000,
"activity": 300,
"reward": [
{
"a": "attr",
"t": "diamond",
"n": 50
"a": "item",
"t": "10000005",
"n": 10
}
]
},
{
"id": 2,
"activity": 2000,
"activity": 600,
"reward": [
{
"a": "attr",
"t": "diamond",
"n": 60
"a": "item",
"t": "10000003",
"n": 2
}
]
},
{
"id": 3,
"activity": 3000,
"activity": 1000,
"reward": [
{
"a": "attr",
"t": "diamond",
"n": 70
"t": "gold",
"n": 600000
}
]
},
{
"id": 4,
"activity": 4000,
"activity": 1500,
"reward": [
{
"a": "attr",
"t": "diamond",
"n": 80
"t": "gold",
"n": 1500000
}
]
},
{
"id": 5,
"activity": 5000,
"activity": 2000,
"reward": [
{
"a": "attr",
"t": "diamond",
"n": 100
"a": "item",
"t": "10000003",
"n": 3
}
]
}

View File

@ -1,102 +1,57 @@
[
{
"lv": 1,
"exp": 0,
"member_max": 22
"exp": 1200,
"member_max": 20
},
{
"lv": 2,
"exp": 1000,
"member_max": 24
"exp": 2520,
"member_max": 21
},
{
"lv": 3,
"exp": 2000,
"member_max": 26
"exp": 3960,
"member_max": 22
},
{
"lv": 4,
"exp": 3000,
"member_max": 28
"exp": 5520,
"member_max": 23
},
{
"lv": 5,
"exp": 4000,
"member_max": 30
"exp": 7200,
"member_max": 24
},
{
"lv": 6,
"exp": 5000,
"member_max": 32
"exp": 9000,
"member_max": 25
},
{
"lv": 7,
"exp": 6000,
"member_max": 34
"exp": 10920,
"member_max": 26
},
{
"lv": 8,
"exp": 7000,
"member_max": 36
"exp": 12960,
"member_max": 27
},
{
"lv": 9,
"exp": 8000,
"member_max": 38
"exp": 15120,
"member_max": 28
},
{
"lv": 10,
"exp": 9000,
"member_max": 40
"exp": 18000,
"member_max": 29
},
{
"lv": 11,
"exp": 10000,
"member_max": 42
},
{
"lv": 12,
"exp": 11000,
"member_max": 44
},
{
"lv": 13,
"exp": 12000,
"member_max": 46
},
{
"lv": 14,
"exp": 13000,
"member_max": 48
},
{
"lv": 15,
"exp": 14000,
"member_max": 50
},
{
"lv": 16,
"exp": 15000,
"member_max": 52
},
{
"lv": 17,
"exp": 16000,
"member_max": 54
},
{
"lv": 18,
"exp": 17000,
"member_max": 56
},
{
"lv": 19,
"exp": 18000,
"member_max": 58
},
{
"lv": 20,
"exp": 19000,
"member_max": 60
"exp": 0,
"member_max": 30
}
]

View File

@ -10,13 +10,18 @@
"reward": [
{
"a": "attr",
"t": "diamond",
"n": 10
"t": "guildcoin",
"n": 50
},
{
"a": "attr",
"t": "guildcoin",
"n": 10
"t": "ps",
"n": 5
},
{
"a": "item",
"t": "17060006",
"n": 4
}
],
"exp": {
@ -36,13 +41,18 @@
"reward": [
{
"a": "attr",
"t": "diamond",
"n": 50
"t": "guildcoin",
"n": 75
},
{
"a": "attr",
"t": "guildcoin",
"n": 50
"t": "ps",
"n": 10
},
{
"a": "item",
"t": "17060007",
"n": 2
}
],
"exp": {
@ -62,13 +72,18 @@
"reward": [
{
"a": "attr",
"t": "diamond",
"t": "guildcoin",
"n": 100
},
{
"a": "attr",
"t": "guildcoin",
"n": 100
"t": "ps",
"n": 15
},
{
"a": "item",
"t": "17060008",
"n": 1
}
],
"exp": {
@ -88,13 +103,18 @@
"reward": [
{
"a": "attr",
"t": "diamond",
"n": 150
"t": "guildcoin",
"n": 100
},
{
"a": "attr",
"t": "guildcoin",
"n": 150
"t": "ps",
"n": 15
},
{
"a": "item",
"t": "17060008",
"n": 1
}
],
"exp": {
@ -114,13 +134,18 @@
"reward": [
{
"a": "attr",
"t": "diamond",
"n": 200
"t": "guildcoin",
"n": 100
},
{
"a": "attr",
"t": "guildcoin",
"n": 200
"t": "ps",
"n": 15
},
{
"a": "item",
"t": "17060008",
"n": 1
}
],
"exp": {

View File

@ -1,44 +1,10 @@
[
{
"type_id": 5011001,
"type_id": 50000001,
"id_list": 1,
"jump_interface": 115,
"task_display": {
"key": "guild_guild_task_task_display_1",
"text": "赠送3次友情点"
},
"reward": [
{
"a": "attr",
"t": "guildcoin",
"n": 50
},
{
"a": "attr",
"t": "gold",
"n": 50000
}
],
"sociaty_reward": [
{
"a": "attr",
"t": "guildactive",
"n": 20
},
{
"a": "attr",
"t": "guildexp",
"n": 20
}
],
"contribution": 50
},
{
"type_id": 5012001,
"id_list": 2,
"jump_interface": 113,
"task_display": {
"key": "guild_guild_task_task_display_2",
"text": "使用好友助战守护者1次"
},
"reward": [
@ -50,30 +16,64 @@
{
"a": "attr",
"t": "gold",
"n": 50000
"n": 100000
}
],
"sociaty_reward": [
{
"a": "attr",
"t": "guildactive",
"n": 20
"n": 10
},
{
"a": "attr",
"t": "guildexp",
"n": 20
"n": 10
}
],
"contribution": 50
},
{
"type_id": 5018001,
"type_id": 50000002,
"id_list": 2,
"jump_interface": 113,
"task_display": {
"key": "guild_guild_task_task_display_2",
"text": "进行3次普通招募"
},
"reward": [
{
"a": "attr",
"t": "guildcoin",
"n": 50
},
{
"a": "attr",
"t": "gold",
"n": 100000
}
],
"sociaty_reward": [
{
"a": "attr",
"t": "guildactive",
"n": 10
},
{
"a": "attr",
"t": "guildexp",
"n": 10
}
],
"contribution": 50
},
{
"type_id": 50000003,
"id_list": 3,
"jump_interface": 107,
"task_display": {
"key": "guild_guild_task_task_display_3",
"text": "进行一次普通招募"
"text": "为任意守护者提升5级"
},
"reward": [
{
@ -84,63 +84,29 @@
{
"a": "attr",
"t": "gold",
"n": 50000
"n": 100000
}
],
"sociaty_reward": [
{
"a": "attr",
"t": "guildactive",
"n": 20
"n": 10
},
{
"a": "attr",
"t": "guildexp",
"n": 20
"n": 10
}
],
"contribution": 50
},
{
"type_id": 5024001,
"type_id": 50000004,
"id_list": 4,
"jump_interface": 103,
"task_display": {
"key": "guild_guild_task_task_display_4",
"text": "为任意守护者提升1级"
},
"reward": [
{
"a": "attr",
"t": "guildcoin",
"n": 50
},
{
"a": "attr",
"t": "gold",
"n": 50000
}
],
"sociaty_reward": [
{
"a": "attr",
"t": "guildactive",
"n": 20
},
{
"a": "attr",
"t": "guildexp",
"n": 20
}
],
"contribution": 50
},
{
"type_id": 5047001,
"id_list": 5,
"jump_interface": 103,
"task_display": {
"key": "guild_guild_task_task_display_5",
"text": "强化任意装备成功6次"
},
"reward": [
@ -152,30 +118,64 @@
{
"a": "attr",
"t": "gold",
"n": 50000
"n": 100000
}
],
"sociaty_reward": [
{
"a": "attr",
"t": "guildactive",
"n": 20
"n": 10
},
{
"a": "attr",
"t": "guildexp",
"n": 20
"n": 10
}
],
"contribution": 50
},
{
"type_id": 5063001,
"type_id": 50000005,
"id_list": 5,
"jump_interface": 11006,
"task_display": {
"key": "guild_guild_task_task_display_5",
"text": "消费500000金币"
},
"reward": [
{
"a": "attr",
"t": "guildcoin",
"n": 50
},
{
"a": "attr",
"t": "gold",
"n": 100000
}
],
"sociaty_reward": [
{
"a": "attr",
"t": "guildactive",
"n": 10
},
{
"a": "attr",
"t": "guildexp",
"n": 10
}
],
"contribution": 50
},
{
"type_id": 50000006,
"id_list": 6,
"jump_interface": 109,
"jump_interface": 11007,
"task_display": {
"key": "guild_guild_task_task_display_6",
"text": "日常任务活跃达到100"
"text": "消费300钻石"
},
"reward": [
{
@ -186,30 +186,30 @@
{
"a": "attr",
"t": "gold",
"n": 50000
"n": 100000
}
],
"sociaty_reward": [
{
"a": "attr",
"t": "guildactive",
"n": 20
"n": 10
},
{
"a": "attr",
"t": "guildexp",
"n": 20
"n": 10
}
],
"contribution": 50
},
{
"type_id": 5068001,
"type_id": 50000007,
"id_list": 7,
"jump_interface": 122,
"jump_interface": 10006,
"task_display": {
"key": "guild_guild_task_task_display_7",
"text": "消费200000金币"
"text": "完成1次功夫派遣任务"
},
"reward": [
{
@ -220,30 +220,30 @@
{
"a": "attr",
"t": "gold",
"n": 50000
"n": 100000
}
],
"sociaty_reward": [
{
"a": "attr",
"t": "guildactive",
"n": 20
"n": 10
},
{
"a": "attr",
"t": "guildexp",
"n": 20
"n": 10
}
],
"contribution": 50
},
{
"type_id": 5104001,
"type_id": 50000008,
"id_list": 8,
"jump_interface": 123,
"jump_interface": 156,
"task_display": {
"key": "guild_guild_task_task_display_8",
"text": "消费100钻石"
"text": "挑战3次竞技场"
},
"reward": [
{
@ -254,19 +254,87 @@
{
"a": "attr",
"t": "gold",
"n": 50000
"n": 100000
}
],
"sociaty_reward": [
{
"a": "attr",
"t": "guildactive",
"n": 20
"n": 10
},
{
"a": "attr",
"t": "guildexp",
"n": 20
"n": 10
}
],
"contribution": 50
},
{
"type_id": 50000009,
"id_list": 9,
"jump_interface": 11012,
"task_display": {
"key": "guild_guild_task_task_display_9",
"text": "挑战3次“维京远征”副本"
},
"reward": [
{
"a": "attr",
"t": "guildcoin",
"n": 50
},
{
"a": "attr",
"t": "gold",
"n": 100000
}
],
"sociaty_reward": [
{
"a": "attr",
"t": "guildactive",
"n": 10
},
{
"a": "attr",
"t": "guildexp",
"n": 10
}
],
"contribution": 50
},
{
"type_id": 50000010,
"id_list": 10,
"jump_interface": 168,
"task_display": {
"key": "guild_guild_task_task_display_10",
"text": "挑战3次“狩猎”副本"
},
"reward": [
{
"a": "attr",
"t": "guildcoin",
"n": 50
},
{
"a": "attr",
"t": "gold",
"n": 100000
}
],
"sociaty_reward": [
{
"a": "attr",
"t": "guildactive",
"n": 10
},
{
"a": "attr",
"t": "guildexp",
"n": 10
}
],
"contribution": 50

File diff suppressed because it is too large Load Diff

View File

@ -1658,5 +1658,15 @@
"n": 1
}
]
},
{
"index": "356",
"var": [
{
"a": "attr",
"t": "starcoin",
"n": 500
}
]
}
]

View File

@ -22,9 +22,9 @@
"n": 1
}
],
"rtype": 1,
"rtype": 2,
"rtime": 6,
"rnum": 10,
"rnum": 8,
"rneed": [
{
"a": "attr",
@ -34,13 +34,15 @@
],
"shopitem": [
10001,
10002,
10003,
10004,
10005,
10006,
10007,
10008
10001,
10001,
10001,
10001,
10001,
10001,
10001,
10001,
10001
]
},
{
@ -66,16 +68,12 @@
"rnum": -1,
"rneed": [],
"shopitem": [
20001,
20002,
20003,
20004,
20005,
20006,
20007,
20008,
20009,
20010
11001,
11002,
11003,
11004,
11005,
11006
]
},
{
@ -106,9 +104,12 @@
"rnum": -1,
"rneed": [],
"shopitem": [
30001,
30002,
30003
12001,
12002,
12003,
12004,
12005,
12006
]
},
{
@ -139,9 +140,13 @@
"rnum": -1,
"rneed": [],
"shopitem": [
40001,
40002,
40003
13001,
13002,
13003,
13004,
13005,
13006,
13007
]
},
{
@ -172,10 +177,12 @@
"rnum": -1,
"rneed": [],
"shopitem": [
50001,
50002,
50003,
50004
14001,
14002,
14003,
14004,
14005,
14006
]
},
{
@ -196,14 +203,20 @@
"n": 1
}
],
"rtype": 3,
"rtype": 4,
"rtime": 1,
"rnum": -1,
"rneed": [],
"shopitem": [
60001,
60002,
60003
15001,
15002,
15003,
15004,
15005,
15006,
15007,
15008,
15009
]
},
{
@ -229,19 +242,19 @@
"rnum": -1,
"rneed": [],
"shopitem": [
70001,
70002,
70003,
70004,
70005,
70006,
70007,
70008,
70009,
70010,
70011,
70012,
70013
16001,
16002,
16003,
16004,
16005,
16006,
16007,
16008,
16009,
16010,
16011,
16012,
16013
]
}
]

File diff suppressed because it is too large Load Diff

View File

@ -29303,10 +29303,7 @@
-1
],
"FollowSK": [],
"SucFollowSK": [
255007316,
255007317
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
@ -29326,8 +29323,8 @@
"Argu": [
390001415,
1000,
1,
0
0,
-1
],
"FollowSK": [],
"SucFollowSK": [],
@ -29377,7 +29374,10 @@
1
],
"FollowSK": [],
"SucFollowSK": [],
"SucFollowSK": [
255007316,
255007317
],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,

View File

@ -22032,7 +22032,7 @@
"ico": "jn_55007_3",
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_1",
"act": "",
"Type": 2,
"CD": 2,
"Where": [],
@ -22048,7 +22048,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_155007311_1",
"text": "冰霜泰坦拥有多层生命值,且[color=#37d8a9]免疫[/color]行动值下降效果自身每次受到的伤害不会超过自身最大生命值的25%[/color]。并且冰霜泰坦损失一层生命值时,会获得[color=#37d8a9]冰霜宝石[/color],同时锁定最后一次对自身造成伤害的目标,对其施加[color=#c84a32]灾祸冰原[/color]状态随后触发技能1附带的效果。若施加[color=#c84a32]灾祸冰原[/color]时自身拥有增益状态则降低目标25%生命上限。"
"text": "冰霜泰坦拥有多层生命值,且免疫行动值下降效果自身每次受到的伤害不会超过自身最大生命值的25%。并且冰霜泰坦损失一层生命值时,会获得[color=#37d8a9]冰霜宝石[/color],同时锁定最后一次对自身造成伤害的目标,对其施加[color=#c84a32]灾祸冰原[/color]状态随后触发技能1附带的效果。若施加[color=#c84a32]灾祸冰原[/color]时自身拥有增益状态则降低目标25%生命上限。"
},
"buffid": [],
"map": ""
@ -22065,7 +22065,7 @@
"ico": "jn_55007_3",
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_3",
"act": "Skill_1",
"Type": 0,
"CD": 0,
"Where": [],
@ -22077,7 +22077,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_155007312_1",
"text": "冰霜泰坦拥有多层生命值,且[color=#37d8a9]免疫[/color]行动值下降效果自身每次受到的伤害不会超过自身最大生命值的35%[/color]。并且冰霜泰坦损失一层生命值时,会获得[color=#37d8a9]冰霜宝石[/color],同时锁定最后一次对自身造成伤害的目标,对其施加[color=#c84a32]灾祸冰原[/color]状态随后触发技能1附带的效果。若施加[color=#c84a32]灾祸冰原[/color]时自身拥有增益状态则降低目标25%生命上限。"
"text": "冰霜泰坦拥有多层生命值,且免疫行动值下降效果自身每次受到的伤害不会超过自身最大生命值的35%[/color]。并且冰霜泰坦损失一层生命值时,会获得[color=#37d8a9]冰霜宝石[/color],同时锁定最后一次对自身造成伤害的目标,对其施加[color=#c84a32]灾祸冰原[/color]状态随后触发技能1附带的效果。若施加[color=#c84a32]灾祸冰原[/color]时自身拥有增益状态则降低目标25%生命上限。"
},
"buffid": [],
"map": ""