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:
liwei 2023-06-25 14:52:05 +08:00
commit c15b96b3ee
11 changed files with 1481 additions and 1517 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bin/json/game_buriedcondi.json
View File

@ -18879,15 +18879,15 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_806", "key": "buried_buried_condi_tasktxt_806",
"text": "装备副本D 4难度2刷1次" "text": "装备副本boss3难度6刷1次"
}, },
"type": 73, "type": 73,
"valid": 0, "valid": 0,
"NPC": 10804, "NPC": 10804,
"value": 1, "value": 1,
"filter": [ "filter": [
4, 3,
2 6
], ],
"filter2": [ "filter2": [
"boss类型", "boss类型",
@ -19022,15 +19022,15 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_812", "key": "buried_buried_condi_tasktxt_812",
"text": "装备副本D 4难度4刷1次" "text": "装备副本boss3难度7刷1次"
}, },
"type": 73, "type": 73,
"valid": 0, "valid": 0,
"NPC": 10864, "NPC": 10864,
"value": 1, "value": 1,
"filter": [ "filter": [
4, 3,
4 7
], ],
"filter2": [ "filter2": [
"boss类型", "boss类型",
@ -19141,15 +19141,15 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_817", "key": "buried_buried_condi_tasktxt_817",
"text": "装备副本D 4难度6刷1次" "text": "装备副本boss3难度8刷1次"
}, },
"type": 73, "type": 73,
"valid": 0, "valid": 0,
"NPC": 10914, "NPC": 10914,
"value": 1, "value": 1,
"filter": [ "filter": [
4, 3,
6 8
], ],
"filter2": [ "filter2": [
"boss类型", "boss类型",

48
bin/json/game_hero.json
View File

@ -12,7 +12,7 @@
"type": 1, "type": 1,
"ip": 7, "ip": 7,
"sd": 1, "sd": 1,
"handbook": -1, "handbook": 1,
"prefab": "13001", "prefab": "13001",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,
@ -84,7 +84,7 @@
"type": 1, "type": 1,
"ip": 6, "ip": 6,
"sd": 1, "sd": 1,
"handbook": -1, "handbook": 1,
"prefab": "13002", "prefab": "13002",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,
@ -156,7 +156,7 @@
"type": 1, "type": 1,
"ip": 7, "ip": 7,
"sd": 1, "sd": 1,
"handbook": -1, "handbook": 1,
"prefab": "13003", "prefab": "13003",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,
@ -228,7 +228,7 @@
"type": 1, "type": 1,
"ip": 5, "ip": 5,
"sd": 1, "sd": 1,
"handbook": -1, "handbook": 1,
"prefab": "13004", "prefab": "13004",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,
@ -804,7 +804,7 @@
"type": 1, "type": 1,
"ip": 9, "ip": 9,
"sd": 1, "sd": 1,
"handbook": -1, "handbook": 1,
"prefab": "14007", "prefab": "14007",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,
@ -948,7 +948,7 @@
"type": 1, "type": 1,
"ip": 8, "ip": 8,
"sd": 1, "sd": 1,
"handbook": -1, "handbook": 1,
"prefab": "15002", "prefab": "15002",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,
@ -1020,7 +1020,7 @@
"type": 1, "type": 1,
"ip": 7, "ip": 7,
"sd": 1, "sd": 1,
"handbook": -1, "handbook": 1,
"prefab": "15003", "prefab": "15003",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,
@ -1380,7 +1380,7 @@
"type": 1, "type": 1,
"ip": 12, "ip": 12,
"sd": 1, "sd": 1,
"handbook": -1, "handbook": 1,
"prefab": "23004", "prefab": "23004",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,
@ -1452,7 +1452,7 @@
"type": 1, "type": 1,
"ip": 6, "ip": 6,
"sd": 1, "sd": 1,
"handbook": -1, "handbook": 1,
"prefab": "24001", "prefab": "24001",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,
@ -1740,7 +1740,7 @@
"type": 1, "type": 1,
"ip": 4, "ip": 4,
"sd": 1, "sd": 1,
"handbook": -1, "handbook": 1,
"prefab": "24005", "prefab": "24005",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,
@ -2028,7 +2028,7 @@
"type": 1, "type": 1,
"ip": 9, "ip": 9,
"sd": 1, "sd": 1,
"handbook": -1, "handbook": 1,
"prefab": "24009", "prefab": "24009",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,
@ -2460,7 +2460,7 @@
"type": 1, "type": 1,
"ip": 3, "ip": 3,
"sd": 1, "sd": 1,
"handbook": -1, "handbook": 1,
"prefab": "33002", "prefab": "33002",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,
@ -2532,7 +2532,7 @@
"type": 1, "type": 1,
"ip": 5, "ip": 5,
"sd": 1, "sd": 1,
"handbook": -1, "handbook": 1,
"prefab": "33003", "prefab": "33003",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,
@ -2964,7 +2964,7 @@
"type": 1, "type": 1,
"ip": 10, "ip": 10,
"sd": 1, "sd": 1,
"handbook": -1, "handbook": 1,
"prefab": "34003", "prefab": "34003",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,
@ -3108,7 +3108,7 @@
"type": 1, "type": 1,
"ip": 7, "ip": 7,
"sd": 1, "sd": 1,
"handbook": -1, "handbook": 1,
"prefab": "34005", "prefab": "34005",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,
@ -3252,7 +3252,7 @@
"type": 1, "type": 1,
"ip": 5, "ip": 5,
"sd": 1, "sd": 1,
"handbook": -1, "handbook": 1,
"prefab": "34007", "prefab": "34007",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,
@ -3324,7 +3324,7 @@
"type": 1, "type": 1,
"ip": 11, "ip": 11,
"sd": 1, "sd": 1,
"handbook": -1, "handbook": 1,
"prefab": "34008", "prefab": "34008",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,
@ -3684,7 +3684,7 @@
"type": 1, "type": 1,
"ip": 12, "ip": 12,
"sd": 1, "sd": 1,
"handbook": -1, "handbook": 1,
"prefab": "35005", "prefab": "35005",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,
@ -3756,7 +3756,7 @@
"type": 1, "type": 1,
"ip": 4, "ip": 4,
"sd": 1, "sd": 1,
"handbook": -1, "handbook": 1,
"prefab": "35006", "prefab": "35006",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,
@ -3972,7 +3972,7 @@
"type": 1, "type": 1,
"ip": 7, "ip": 7,
"sd": 1, "sd": 1,
"handbook": -1, "handbook": 1,
"prefab": "43003", "prefab": "43003",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,
@ -4188,7 +4188,7 @@
"type": 1, "type": 1,
"ip": 9, "ip": 9,
"sd": 1, "sd": 1,
"handbook": -1, "handbook": 1,
"prefab": "43006", "prefab": "43006",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,
@ -4548,7 +4548,7 @@
"type": 1, "type": 1,
"ip": 6, "ip": 6,
"sd": 1, "sd": 1,
"handbook": -1, "handbook": 1,
"prefab": "44004", "prefab": "44004",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,
@ -4620,7 +4620,7 @@
"type": 1, "type": 1,
"ip": 4, "ip": 4,
"sd": 1, "sd": 1,
"handbook": -1, "handbook": 1,
"prefab": "44006", "prefab": "44006",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,
@ -4692,7 +4692,7 @@
"type": 1, "type": 1,
"ip": 4, "ip": 4,
"sd": 1, "sd": 1,
"handbook": -1, "handbook": 1,
"prefab": "45001", "prefab": "45001",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,

50
bin/json/game_initial.json
View File

@ -169,56 +169,6 @@
} }
] ]
}, },
{
"index": "172",
"var": [
{
"a": "hero",
"t": "25001",
"n": 1
}
]
},
{
"index": "183",
"var": [
{
"a": "hero",
"t": "24002",
"n": 1
}
]
},
{
"index": "184",
"var": [
{
"a": "hero",
"t": "34006",
"n": 1
}
]
},
{
"index": "185",
"var": [
{
"a": "hero",
"t": "14003",
"n": 1
}
]
},
{
"index": "186",
"var": [
{
"a": "hero",
"t": "35001",
"n": 1
}
]
},
{ {
"index": "187", "index": "187",
"var": [ "var": [

2837
bin/json/game_mainstage.json
View File

File diff suppressed because it is too large Load Diff

2
bin/json/game_skillafteratk.json
View File

@ -29346,7 +29346,7 @@
"Argu": [ "Argu": [
390001415, 390001415,
1000, 1000,
1, 10,
-1 -1
], ],
"FollowSK": [], "FollowSK": [],

4
bin/json/game_skillatk.json
View File

@ -22002,7 +22002,7 @@
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_2", "act": "Skill_2",
"Type": 1, "Type": 1,
"CD": 0, "CD": 2,
"Where": [ "Where": [
"SelfHasBuff=390001415" "SelfHasBuff=390001415"
], ],
@ -22035,7 +22035,7 @@
"IsMelee": 0, "IsMelee": 0,
"act": "", "act": "",
"Type": 2, "Type": 2,
"CD": 2, "CD": 0,
"Where": [], "Where": [],
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {

1
bin/json/game_skillbuff.json
View File

@ -3047,7 +3047,6 @@
}, },
"BuffType": 72, "BuffType": 72,
"EffectArgu": [ "EffectArgu": [
250,
50 50
], ],
"BufParNum": 1, "BufParNum": 1,

2
bin/json/game_skillpassive.json
View File

@ -2745,7 +2745,7 @@
"AddCon": [], "AddCon": [],
"PasPr": 1000, "PasPr": 1000,
"Type": "FightHpChangePas", "Type": "FightHpChangePas",
"MaxEmitTimes": 1, "MaxEmitTimes": 99,
"Callback": [ "Callback": [
4, 4,
255007314 255007314

4
bin/json/game_worldall.json
View File

@ -22,7 +22,7 @@
"id": 20, "id": 20,
"name": { "name": {
"key": "worldtask_world_all_name_2", "key": "worldtask_world_all_name_2",
"text": "章节2:大龙复仇记" "text": "章节2:大龙归来"
}, },
"task_icon": "", "task_icon": "",
"task_txt": { "task_txt": {
@ -60,7 +60,7 @@
"id": 40, "id": 40,
"name": { "name": {
"key": "worldtask_world_all_name_4", "key": "worldtask_world_all_name_4",
"text": "章节4:黑市风波" "text": "章节4:交易所风波"
}, },
"task_icon": "", "task_icon": "",
"task_txt": { "task_txt": {

24
bin/json/game_worldtask.json
View File

@ -50,7 +50,7 @@
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_2", "key": "worldtask_world_task_task_details_2",
"text": "传承者面临身体半透明的困扰，骇客蛛发挥强大的黑客技术，帮忙寻找恢复实体化的方法" "text": "传承者面临身体半透明的困扰，骇客蛛发挥强大的黑客技术，帮忙寻找恢复实体化的方法。"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_2", "key": "worldtask_world_task_npctxt_2",
@ -86,7 +86,7 @@
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_3", "key": "worldtask_world_task_task_details_3",
"text": "跟着阿宝在中轴城逛逛，寻找来自《守护者联盟》的邦尼兔" "text": "跟着阿宝在中轴城逛逛，寻找来自《守护者联盟》的邦尼兔。"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_3", "key": "worldtask_world_task_npctxt_3",
@ -103,6 +103,11 @@
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 5000 "n": 5000
},
{
"a": "hero",
"t": "44004",
"n": 1
} }
], ],
"module": [] "module": []
@ -122,11 +127,11 @@
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_4", "key": "worldtask_world_task_task_details_4",
"text": "刚踏出飞船就遇到了潜入船舱甲板的恐惧灵，尝试击败他们！" "text": "刚踏出飞船就遇到了潜入船舱甲板的豺狼小怪，尝试击败他们！"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_4", "key": "worldtask_world_task_npctxt_4",
"text": "击退恐惧灵小怪" "text": "击退豺狼小怪小怪"
}, },
"npc": 10020, "npc": 10020,
"completetask": [ "completetask": [
@ -211,6 +216,11 @@
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 5000 "n": 5000
},
{
"a": "hero",
"t": "24004",
"n": 1
} }
], ],
"module": [] "module": []
@ -230,7 +240,7 @@
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_7", "key": "worldtask_world_task_task_details_7",
"text": "正当阿宝和邦尼兔斗嘴时，圣桃树旁出现一团黑气，随后恐惧灵再次出现。" "text": "正当阿宝和邦尼兔斗嘴时，圣桃树旁出现一团黑气，随后豺狼小怪再次出现。"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_7", "key": "worldtask_world_task_npctxt_7",
@ -302,7 +312,7 @@
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_9", "key": "worldtask_world_task_task_details_9",
"text": "跟着恐惧灵消失的方向，我们一行人追踪到熊猫武馆。武馆是中轴城守护者提高战斗力、习武比试的地方。" "text": "跟着豺狼小怪消失的方向，我们一行人追踪到熊猫武馆。武馆是中轴城守护者提高战斗力、习武比试的地方。"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_9", "key": "worldtask_world_task_npctxt_9",
@ -772,7 +782,7 @@
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_22", "key": "worldtask_world_task_task_details_22",
"text": "刚召唤结束，一股黑气围绕在圣桃树旁久久不散，众人惊愕下，大量恐惧灵出现，不断袭击中轴城的防护网。" "text": "刚召唤结束，一股黑气围绕在圣桃树旁久久不散，众人惊愕下，大量豺狼小怪出现，不断袭击中轴城的防护网。"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_22", "key": "worldtask_world_task_npctxt_22",

8
modules/modulebase.go
View File

@ -368,7 +368,7 @@ func (this *ModuleBase) ConsumeRes(session comm.IUserSession, res []*cfg.Gameatn
case comm.ItemType: case comm.ItemType:
items[v.T] -= v.N items[v.T] -= v.N
default: default:
this.Errorf("not found res type") // 找不到资源类型 this.Error("not found res type", log.Field{Key: "Type", Value: v.A}) // 找不到资源类型
} }
} }
// 校验数量 // 校验数量
@ -467,7 +467,7 @@ func (this *ModuleBase) DispenseRes(session comm.IUserSession, res []*cfg.Gameat
case comm.PerType: case comm.PerType:
per[v.T] = 1 per[v.T] = 1
default: default:
this.Errorf("not found res type") // 找不到资源类型 this.Error("not found res type", log.Field{Key: "Type", Value: v.A}) // 找不到资源类型
} }
} }
@ -667,7 +667,7 @@ func (this *ModuleBase) DispenseAtno(session comm.IUserSession, res []*cfg.Gamea
case comm.VipType: case comm.VipType:
vip[v.T] += v.N vip[v.T] += v.N
default: default:
this.Error("not found res type") // 找不到资源类型 this.Error("not found res type", log.Field{Key: "Type", Value: v.A}) // 找不到资源类型
} }
} }
@ -739,7 +739,7 @@ func (this *ModuleBase) FormatRes(res []*cfg.Gameatn) (ret []*cfg.Gameatn) {
case comm.ItemType: case comm.ItemType:
items[v.T] += v.N items[v.T] += v.N
default: default:
this.Errorf("not found res type") // 找不到资源类型 this.Error("not found res type", log.Field{Key: "Type", Value: v.A}) // 找不到资源类型
} }
} }
for k, v := range attrs { for k, v := range attrs {