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:
liwei1dao 2024-01-19 17:28:04 +08:00
commit df7465f47d
12 changed files with 125 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
bin/json/game_chatsystem.json
View File

@ -6,7 +6,7 @@
"datatype": 0,
"text": {
"key": "chat_system_text_1",
"text": "<font color=#ff3f3f>【系统】</font> 中午好 !"
"text": "<font color=#ee9042>【系统】</font> 中午好 !"
},
"data": 0,
"data2": 0,
@ -29,7 +29,7 @@
"datatype": 0,
"text": {
"key": "chat_system_text_2",
"text": "<font color=#ff3f3f>【系统】</font> 中午好 !"
"text": "<font color=#ee9042>【系统】</font> 中午好 !"
},
"data": 0,
"data2": 0,
@ -50,7 +50,7 @@
"datatype": 0,
"text": {
"key": "chat_system_text_3",
"text": "<font color=#ff3f3f>【系统】</font> 中午好 !"
"text": "<font color=#ee9042>【系统】</font> 中午好 !"
},
"data": 0,
"data2": 0,
@ -71,7 +71,7 @@
"datatype": 0,
"text": {
"key": "chat_system_text_4",
"text": "<font color=#ff3f3f>【系统】</font> 欢迎来到梦工场 !"
"text": "<font color=#ee9042>【系统】</font> 欢迎来到梦工场 !"
},
"data": 0,
"data2": 0,
@ -86,7 +86,7 @@
"datatype": 3,
"text": {
"key": "chat_system_text_5",
"text": "<font color=#ffc73f>【全服】{0}</font> 经过不懈的努力，将{1}强化至+13！"
"text": "<font color=#ee9042>【全服】{0}</font> 经过不懈的努力，将{1}强化至+13！"
},
"data": 14,
"data2": 0,
@ -101,7 +101,7 @@
"datatype": 3,
"text": {
"key": "chat_system_text_6",
"text": "<font color=#ffc73f>【全服】{0}</font> 经过不懈的努力，将{1}强化至+14！"
"text": "<font color=#ee9042>【全服】{0}</font> 经过不懈的努力，将{1}强化至+14！"
},
"data": 15,
"data2": 0,
@ -116,7 +116,7 @@
"datatype": 3,
"text": {
"key": "chat_system_text_7",
"text": "<font color=#ffc73f>【全服】{0}</font> 经过不懈的努力，将 {1} 强化至+15！"
"text": "<font color=#ee9042>【全服】{0}</font> 经过不懈的努力，将 {1} 强化至+15！"
},
"data": 16,
"data2": 0,
@ -131,7 +131,7 @@
"datatype": 4,
"text": {
"key": "chat_system_text_8",
"text": "<font color=#ffc73f>【全服】{0}</font> 突破爬塔100层！"
"text": "<font color=#ee9042>【全服】{0}</font> 突破爬塔100层！"
},
"data": 100,
"data2": 0,
@ -161,7 +161,7 @@
"datatype": 1,
"text": {
"key": "chat_system_text_10",
"text": "【传闻】{0}通关了赛季塔50层！"
"text": "【传闻】<font color=#ee9042>{0}</font>通关了赛季塔50层！"
},
"data": 50,
"data2": 0,
@ -176,7 +176,7 @@
"datatype": 3,
"text": {
"key": "chat_system_text_11",
"text": "【传闻】{0}已经将{1}培养至60级！"
"text": "【传闻】<font color=#ee9042>{0}</font>已经将{1}培养至60级！"
},
"data": 60,
"data2": 0,
@ -191,7 +191,7 @@
"datatype": 3,
"text": {
"key": "chat_system_text_12",
"text": "【传闻】{0}已经将{1}培养至6星！"
"text": "【传闻】<font color=#ee9042>{0}</font>已经将{1}培养至6星！"
},
"data": 6,
"data2": 0,
@ -206,7 +206,7 @@
"datatype": 3,
"text": {
"key": "chat_system_text_13",
"text": "【传闻】{0}已经将{1}技能培养至满级！"
"text": "【传闻】<font color=#ee9042>{0}</font>已经将{1}技能培养至满级！"
},
"data": 5,
"data2": 0,
@ -221,7 +221,7 @@
"datatype": 3,
"text": {
"key": "chat_system_text_14",
"text": "【传闻】{0}已经将{1}回响至满级！"
"text": "【传闻】<font color=#ee9042>{0}</font>已经将{1}回响至满级！"
},
"data": 5,
"data2": 0,
@ -236,7 +236,7 @@
"datatype": 3,
"text": {
"key": "chat_system_text_15",
"text": "【传闻】{0}已经将{1}觉醒至满级！"
"text": "【传闻】<font color=#ee9042>{0}</font>已经将{1}觉醒至满级！"
},
"data": 6,
"data2": 5,
@ -251,7 +251,7 @@
"datatype": 1,
"text": {
"key": "chat_system_text_16",
"text": "【传闻】{0}已经达到了50级!"
"text": "【传闻】<font color=#ee9042>{0}</font>已经达到了50级!"
},
"data": 50,
"data2": 0,
@ -266,7 +266,7 @@
"datatype": 3,
"text": {
"key": "chat_system_text_17",
"text": "【传闻】{0}在招募中获得了{1}!"
"text": "【传闻】<font color=#ee9042>{0}</font>在招募中获得了{1}!"
},
"data": 5,
"data2": 0,
@ -281,7 +281,7 @@
"datatype": 1,
"text": {
"key": "chat_system_text_18",
"text": "【传闻】{0}通关了维京远征火焰泰坦难度10！"
"text": "【传闻】<font color=#ee9042>{0}</font>通关了维京远征火焰泰坦难度10！"
},
"data": 10,
"data2": 1,
@ -296,7 +296,7 @@
"datatype": 1,
"text": {
"key": "chat_system_text_19",
"text": "【传闻】{0}通关了维京远征冰霜泰坦难度10！"
"text": "【传闻】<font color=#ee9042>{0}</font>通关了维京远征冰霜泰坦难度10！"
},
"data": 10,
"data2": 2,
@ -311,7 +311,7 @@
"datatype": 1,
"text": {
"key": "chat_system_text_20",
"text": "【传闻】{0}通关了维京远征森林泰坦难度10！"
"text": "【传闻】<font color=#ee9042>{0}</font>通关了维京远征森林泰坦难度10！"
},
"data": 10,
"data2": 3,
@ -326,7 +326,7 @@
"datatype": 1,
"text": {
"key": "chat_system_text_21",
"text": "【传闻】{0}通关了维京远征冰霜泰坦（武器）难度10！"
"text": "【传闻】<font color=#ee9042>{0}</font>通关了维京远征冰霜泰坦（武器）难度10！"
},
"data": 10,
"data2": 11,
@ -341,7 +341,7 @@
"datatype": 1,
"text": {
"key": "chat_system_text_22",
"text": "【传闻】{0}通关了维京远征森林泰坦（饰品）难度10！"
"text": "【传闻】<font color=#ee9042>{0}</font>通关了维京远征森林泰坦（饰品）难度10！"
},
"data": 10,
"data2": 12,
@ -356,7 +356,7 @@
"datatype": 1,
"text": {
"key": "chat_system_text_23",
"text": "【传闻】{0}通关了猎魂巨型猩猩难度10！"
"text": "【传闻】<font color=#ee9042>{0}</font>通关了猎魂巨型猩猩难度10！"
},
"data": 10,
"data2": 1,
@ -371,7 +371,7 @@
"datatype": 1,
"text": {
"key": "chat_system_text_24",
"text": "【传闻】{0}通关了猎魂火龙难度10！"
"text": "【传闻】<font color=#ee9042>{0}</font>通关了猎魂火龙难度10！"
},
"data": 10,
"data2": 2,
@ -386,7 +386,7 @@
"datatype": 1,
"text": {
"key": "chat_system_text_25",
"text": "【传闻】{0}通关了猎魂大厨难度10！"
"text": "【传闻】<font color=#ee9042>{0}</font>通关了猎魂大厨难度10！"
},
"data": 10,
"data2": 3,
@ -401,7 +401,7 @@
"datatype": 1,
"text": {
"key": "chat_system_text_26",
"text": "【传闻】{0}通关了猎魂太空海星难度10！"
"text": "【传闻】<font color=#ee9042>{0}</font>通关了猎魂太空海星难度10！"
},
"data": 10,
"data2": 4,

21
bin/json/game_mainstage.json
View File

@ -41024,9 +41024,9 @@
"inherit": false,
"battle_fail": false,
"venturemodelspeed": 0,
"venturemodelscale": 2,
"venturemodelscale": 3,
"move_type": 1,
"venturemodel": "Person/mount/54101_q.prefab",
"venturemodel": "Person/mount/54101_q_fly.prefab",
"bubbletalk": {
"key": "",
"text": ""
@ -41479,9 +41479,9 @@
"inherit": false,
"battle_fail": false,
"venturemodelspeed": 0,
"venturemodelscale": 2,
"venturemodelscale": 3,
"move_type": 1,
"venturemodel": "Person/mount/54101_q.prefab",
"venturemodel": "Person/mount/54101_q_fly.prefab",
"bubbletalk": {
"key": "",
"text": ""
@ -41644,15 +41644,18 @@
"inherit": false,
"battle_fail": false,
"venturemodelspeed": 0,
"venturemodelscale": 0,
"move_type": 0,
"venturemodel": "Person/35002/35002_q.prefab",
"venturemodelscale": 3,
"move_type": 1,
"venturemodel": "Person/mount/54101_q_fly.prefab",
"bubbletalk": {
"key": "",
"text": ""
},
"venturetype": 0,
"ventureavatar": [],
"venturetype": 2,
"ventureavatar": [
"sbkp_js_35002",
"sbkp_js_14003"
],
"scene_effect": [],
"scene_effectfilter": "",
"is_near": false,

4
bin/json/game_monsterformat.json
View File

@ -127375,8 +127375,8 @@
"equip": [],
"newskill": [],
"lv": 65,
"hppro": 22,
"atkpro": 3.5,
"hppro": 20,
"atkpro": 4,
"defpro": 0.5,
"skill1": 1,
"skill2": 1,

2
bin/json/game_msgdistrib.json
View File

@ -181,7 +181,7 @@
},
{
"msgid": "plunder",
"open": true,
"open": false,
"routrules": "~/worker",
"describe": "掠夺"
}

40
bin/json/game_plunder.json
View File

@ -40,7 +40,7 @@
"n": 1
}
],
"extime": 100
"extime": 300
},
{
"id": 102,
@ -83,7 +83,7 @@
"n": 2
}
],
"extime": 100
"extime": 300
},
{
"id": 103,
@ -126,7 +126,7 @@
"n": 3
}
],
"extime": 100
"extime": 300
},
{
"id": 104,
@ -169,7 +169,7 @@
"n": 3
}
],
"extime": 100
"extime": 300
},
{
"id": 105,
@ -212,7 +212,7 @@
"n": 4
}
],
"extime": 100
"extime": 300
},
{
"id": 106,
@ -255,7 +255,7 @@
"n": 5
}
],
"extime": 100
"extime": 300
},
{
"id": 107,
@ -298,7 +298,7 @@
"n": 1
}
],
"extime": 100
"extime": 300
},
{
"id": 108,
@ -341,7 +341,7 @@
"n": 1
}
],
"extime": 100
"extime": 300
},
{
"id": 109,
@ -384,7 +384,7 @@
"n": 2
}
],
"extime": 100
"extime": 300
},
{
"id": 110,
@ -427,7 +427,7 @@
"n": 3
}
],
"extime": 100
"extime": 300
},
{
"id": 111,
@ -470,7 +470,7 @@
"n": 4
}
],
"extime": 100
"extime": 300
},
{
"id": 112,
@ -513,7 +513,7 @@
"n": 4
}
],
"extime": 100
"extime": 300
},
{
"id": 113,
@ -556,7 +556,7 @@
"n": 5
}
],
"extime": 100
"extime": 300
},
{
"id": 114,
@ -599,7 +599,7 @@
"n": 1
}
],
"extime": 100
"extime": 300
},
{
"id": 115,
@ -642,7 +642,7 @@
"n": 2
}
],
"extime": 100
"extime": 300
},
{
"id": 116,
@ -685,7 +685,7 @@
"n": 2
}
],
"extime": 100
"extime": 300
},
{
"id": 117,
@ -728,7 +728,7 @@
"n": 3
}
],
"extime": 100
"extime": 300
},
{
"id": 118,
@ -771,7 +771,7 @@
"n": 4
}
],
"extime": 100
"extime": 300
},
{
"id": 119,
@ -814,7 +814,7 @@
"n": 5
}
],
"extime": 100
"extime": 300
},
{
"id": 120,
@ -857,6 +857,6 @@
"n": 5
}
],
"extime": 100
"extime": 300
}
]

2
bin/json/game_skillafteratk.json
View File

@ -31012,7 +31012,7 @@
"Argu": [
390001415,
1000,
2,
1,
-1
],
"FollowSK": [],

2
bin/json/game_skillatk.json
View File

@ -24820,7 +24820,7 @@
"IsMelee": 0,
"act": "Skill_2",
"Type": 1,
"CD": 0,
"CD": 1,
"Where": [
"SelfHasBuff=390001415"
],

18
bin/json/game_skillbuff.json
View File

@ -32,7 +32,7 @@
"buffeffect": "",
"buffpos": "根节点",
"AddTrigger": 0,
"TriggerEffect": "",
"TriggerEffect": "effect_common_addbuff",
"TriggerPos": "",
"TriggerAnim": "",
"forbidFloat": 0,
@ -72,7 +72,7 @@
"buffeffect": "",
"buffpos": "根节点",
"AddTrigger": 0,
"TriggerEffect": "",
"TriggerEffect": "effect_common_addbuff",
"TriggerPos": "",
"TriggerAnim": "",
"forbidFloat": 0,
@ -112,7 +112,7 @@
"buffeffect": "",
"buffpos": "根节点",
"AddTrigger": 0,
"TriggerEffect": "",
"TriggerEffect": "effect_common_addbuff",
"TriggerPos": "",
"TriggerAnim": "",
"forbidFloat": 0,
@ -151,7 +151,7 @@
"buffeffect": "",
"buffpos": "根节点",
"AddTrigger": 0,
"TriggerEffect": "",
"TriggerEffect": "effect_common_addbuff",
"TriggerPos": "",
"TriggerAnim": "",
"forbidFloat": 0,
@ -1479,11 +1479,11 @@
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_fs",
"buffeffect": "effect_common_fusu",
"buffeffect": "",
"buffpos": "根节点",
"AddTrigger": 0,
"TriggerEffect": "",
"TriggerPos": "",
"TriggerEffect": "effect_common_fusu",
"TriggerPos": "根节点",
"TriggerAnim": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
@ -13054,7 +13054,7 @@
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_jg",
"buffeffect": "effect_buff_jingu",
"buffpos": "根节点",
"buffpos": "胸",
"AddTrigger": 0,
"TriggerEffect": "",
"TriggerPos": "",
@ -13277,7 +13277,7 @@
"buffeffect": "",
"buffpos": "根节点",
"AddTrigger": 0,
"TriggerEffect": "",
"TriggerEffect": "effect_43002_buff_1",
"TriggerPos": "",
"TriggerAnim": "Buff",
"forbidFloat": 0,

128
bin/json/game_worldrd.json
View File

@ -7,9 +7,9 @@
"text": "无事发生"
},
"eventweight": 40000,
"eventtype": 0,
"battleready": 0,
"battleid": 0,
"eventtype": 2,
"battleready": 126,
"battleid": 101011,
"getitem": []
},
{
@ -20,7 +20,7 @@
"text": "打怪"
},
"eventweight": 30000,
"eventtype": 1,
"eventtype": 2,
"battleready": 126,
"battleid": 101011,
"getitem": []
@ -34,15 +34,9 @@
},
"eventweight": 10000,
"eventtype": 2,
"battleready": 0,
"battleid": 0,
"getitem": [
{
"a": "attr",
"t": "gold",
"n": 10000
}
]
"battleready": 126,
"battleid": 101011,
"getitem": []
},
{
"id": 4,
@ -52,16 +46,10 @@
"text": "获取金币"
},
"eventweight": 10000,
"eventtype": 0,
"battleready": 0,
"battleid": 0,
"getitem": [
{
"a": "attr",
"t": "gold",
"n": 38000
}
]
"eventtype": 2,
"battleready": 126,
"battleid": 101011,
"getitem": []
},
{
"id": 5,
@ -71,16 +59,10 @@
"text": "获取金币"
},
"eventweight": 10000,
"eventtype": 0,
"battleready": 0,
"battleid": 0,
"getitem": [
{
"a": "attr",
"t": "gold",
"n": 50000
}
]
"eventtype": 2,
"battleready": 126,
"battleid": 101011,
"getitem": []
},
{
"id": 6,
@ -90,9 +72,9 @@
"text": "无事发生"
},
"eventweight": 40000,
"eventtype": 0,
"battleready": 0,
"battleid": 0,
"eventtype": 2,
"battleready": 126,
"battleid": 101011,
"getitem": []
},
{
@ -103,7 +85,7 @@
"text": "打怪"
},
"eventweight": 30000,
"eventtype": 1,
"eventtype": 2,
"battleready": 126,
"battleid": 101011,
"getitem": []
@ -117,15 +99,9 @@
},
"eventweight": 10000,
"eventtype": 2,
"battleready": 0,
"battleid": 0,
"getitem": [
{
"a": "attr",
"t": "gold",
"n": 10000
}
]
"battleready": 126,
"battleid": 101011,
"getitem": []
},
{
"id": 9,
@ -136,15 +112,9 @@
},
"eventweight": 10000,
"eventtype": 2,
"battleready": 0,
"battleid": 0,
"getitem": [
{
"a": "attr",
"t": "gold",
"n": 44004
}
]
"battleready": 126,
"battleid": 101011,
"getitem": []
},
{
"id": 10,
@ -154,9 +124,9 @@
"text": "无事发生"
},
"eventweight": 40000,
"eventtype": 0,
"battleready": 0,
"battleid": 0,
"eventtype": 2,
"battleready": 126,
"battleid": 101011,
"getitem": []
},
{
@ -167,7 +137,7 @@
"text": "打怪"
},
"eventweight": 30000,
"eventtype": 1,
"eventtype": 2,
"battleready": 126,
"battleid": 101011,
"getitem": []
@ -181,15 +151,9 @@
},
"eventweight": 10000,
"eventtype": 2,
"battleready": 0,
"battleid": 0,
"getitem": [
{
"a": "attr",
"t": "gold",
"n": 10000
}
]
"battleready": 126,
"battleid": 101011,
"getitem": []
},
{
"id": 13,
@ -199,16 +163,10 @@
"text": "获取金币"
},
"eventweight": 10000,
"eventtype": 0,
"battleready": 0,
"battleid": 0,
"getitem": [
{
"a": "attr",
"t": "gold",
"n": 38000
}
]
"eventtype": 2,
"battleready": 126,
"battleid": 101011,
"getitem": []
},
{
"id": 14,
@ -218,15 +176,9 @@
"text": "获取金币"
},
"eventweight": 10000,
"eventtype": 0,
"battleready": 0,
"battleid": 0,
"getitem": [
{
"a": "attr",
"t": "gold",
"n": 50000
}
]
"eventtype": 2,
"battleready": 126,
"battleid": 101011,
"getitem": []
}
]

20
bin/json/game_worldtask.json
View File

@ -11804,9 +11804,7 @@
"trigger": 0,
"npc": 60240,
"completetask": [
50000034,
500000341,
500000342
50000034
],
"deliver_npc": 0,
"taskend_removeitem": [],
@ -11869,9 +11867,7 @@
"trigger": 0,
"npc": 60250,
"completetask": [
50000035,
500000351,
500000352
50000035
],
"deliver_npc": 0,
"taskend_removeitem": [],
@ -11934,9 +11930,7 @@
"trigger": 0,
"npc": 60260,
"completetask": [
50000036,
500000361,
500000362
50000036
],
"deliver_npc": 0,
"taskend_removeitem": [],
@ -11999,9 +11993,7 @@
"trigger": 0,
"npc": 60270,
"completetask": [
50000037,
500000371,
500000372
50000037
],
"deliver_npc": 0,
"taskend_removeitem": [],
@ -12064,9 +12056,7 @@
"trigger": 0,
"npc": 60280,
"completetask": [
50000038,
500000381,
500000382
50000038
],
"deliver_npc": 0,
"taskend_removeitem": [],

2
modules/plunder/api_pvpchallenge.go
View File

@ -89,7 +89,7 @@ func (this *apiComp) PvpChallenge(session comm.IUserSession, req *pb.PlunderPvpC
}
return
}
if land.Ship[req.Oid].Line.Etime > configure.Now().Unix() { // 船到达不能被掠夺
if land.Ship[req.Oid].Line.Etime < configure.Now().Unix() { // 船到达不能被掠夺
errdata = &pb.ErrorData{
Code: pb.ErrorCode_PlundeShipReach,
Title: pb.ErrorCode_PlundeShipReach.ToString(),

8
modules/plunder/model_land.go
View File

@ -100,6 +100,14 @@ func (this *modelLand) createPlunderLandData(uid string) (land *pb.DBPlunderLand
if len(uInfos) >= 20 {
break
}
if list, err := this.module.modelPlunder.getPlunderData(v.Uid); err == nil {
if list.Landid == "" {
list.Landid = land.Id
this.module.modelPlunder.changePlunderData(v.Uid, map[string]interface{}{
"landid": land.Id,
})
}
}
}
}