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

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

Browse Source
This commit is contained in:
liwei 2023-06-27 14:48:36 +08:00
commit d8b78ca40b
10 changed files with 329 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/json/game_itemlink.json
View File

@ -276,11 +276,11 @@
"id": 10014, "id": 10014,
"title": { "title": {
"key": "itemlink_itemlink_title_12", "key": "itemlink_itemlink_title_12",
"text": "竞技场" "text": "竞技场直接购买"
}, },
"desc": { "desc": {
"key": "itemlink_itemlink_desc_12", "key": "itemlink_itemlink_desc_12",
"text": "竞技场" "text": "直接购买入口"
}, },
"jumpid": 10014, "jumpid": 10014,
"icon": "ty_qp_jjc" "icon": "ty_qp_jjc"

17
bin/json/game_photofilter.json
View File

@ -1,15 +1,6 @@
[ [
{ {
"id": 1, "id": 1,
"filtername": {
"key": "photoshop_filter_filtername_1",
"text": "洛圣都"
},
"filter": "效果1",
"img": "lj_img_tp"
},
{
"id": 2,
"filtername": { "filtername": {
"key": "photoshop_filter_filtername_3", "key": "photoshop_filter_filtername_3",
"text": "功夫早晨" "text": "功夫早晨"
@ -18,16 +9,16 @@
"img": "lj_img_04" "img": "lj_img_04"
}, },
{ {
"id": 3, "id": 2,
"filtername": { "filtername": {
"key": "photoshop_filter_filtername_4", "key": "photoshop_filter_filtername_4",
"text": "史莱克回忆" "text": "史莱克回忆"
}, },
"filter": "效果4", "filter": "效果2",
"img": "lj_img_02" "img": "lj_img_02"
}, },
{ {
"id": 4, "id": 3,
"filtername": { "filtername": {
"key": "photoshop_filter_filtername_5", "key": "photoshop_filter_filtername_5",
"text": "波比暖阳" "text": "波比暖阳"
@ -36,7 +27,7 @@
"img": "lj_img_03" "img": "lj_img_03"
}, },
{ {
"id": 5, "id": 4,
"filtername": { "filtername": {
"key": "photoshop_filter_filtername_6", "key": "photoshop_filter_filtername_6",
"text": "梦魇降临" "text": "梦魇降临"

12
bin/json/game_ruledesc.json
View File

@ -161,7 +161,7 @@
}, },
"content": { "content": {
"key": "ruledesc_ruledesc_content_15", "key": "ruledesc_ruledesc_content_15",
"text": "这里可以查看你获得的所有守护者们，选择守护者点击右侧按钮可以查看详细界面并且强化他们。<br>在强化界面，可以有各种方式强化守护者。<br>守护者等级强化：<br>点击守护者经验条下方的加号按钮可以进入守护者升级界面，使用护身符可以快速提升守护者等级。<br>守护者升星：<br>当守护者等级达到当前星级最大值（三星最大等级为30级，四星为40级，5星为50级），可以使用荣耀徽章提升守护者星级，并解锁最高等级上限。守护者最高为6星<br>守护者技能等级强化：<br>点击技能图标上方的按钮，可以进入守护者技能升级界面，使用不同等级的功夫卷轴可以强化不同稀有度的守护者的技能等级。<br>守护者觉醒：<br>使用觉醒强化你的守护者。觉醒道具守护之心主要为招募重复守护者解锁。<br>守护者共鸣：<br>使用共鸣强化你的守护者。共鸣强化道具可以再狩猎与宝箱中获得。" "text": "这里可以查看你获得的所有守护者们，选择守护者点击右侧按钮可以查看详细界面并且强化他们。<br>在强化界面，可以有各种方式强化守护者。<br>守护者等级强化：<br>点击守护者经验条下方的加号按钮可以进入守护者升级界面，使用护身符可以快速提升守护者等级。<br>守护者升星：<br>当守护者等级达到当前星级最大值（三星最大等级为30级，四星为40级，5星为50级），可以使用荣耀徽章提升守护者星级，并解锁最高等级上限。守护者最高为6星<br>守护者技能等级强化：<br>点击技能图标上方的按钮，可以进入守护者技能升级界面，使用不同等级的功夫卷轴可以强化不同稀有度的守护者的技能等级。<br>守护者觉醒：<br>使用觉醒强化你的守护者。觉醒道具守护之心主要为招募重复守护者获得。<br>守护者回响：<br>使用回响强化你的守护者。共鸣强化道具可以再狩猎与宝箱中获得。"
} }
}, },
{ {
@ -267,11 +267,11 @@
"id": 10025, "id": 10025,
"title": { "title": {
"key": "ruledesc_ruledesc_title_25", "key": "ruledesc_ruledesc_title_25",
"text": "共鸣说明" "text": "回响说明"
}, },
"content": { "content": {
"key": "ruledesc_ruledesc_content_25", "key": "ruledesc_ruledesc_content_25",
"text": "这里可以使用共鸣强化你的守护者。<br>共鸣强化道具可在狩猎与宝箱中获得。" "text": "这里可以使用回响强化你的守护者。<br>回响强化道具可在狩猎与宝箱中获得。"
} }
}, },
{ {
@ -322,11 +322,11 @@
"id": 10030, "id": 10030,
"title": { "title": {
"key": "ruledesc_ruledesc_title_30", "key": "ruledesc_ruledesc_title_30",
"text": "铁匠铺锻造升级功能说明" "text": "装备手册说明"
}, },
"content": { "content": {
"key": "ruledesc_ruledesc_content_30", "key": "ruledesc_ruledesc_content_30",
"text": "这里可以强化锻造炉，每当前一个提升至5级时解锁下一个锻造强化选项。" "text": "这里可以使用装备手册的各个技能强化锻造炉。<br>技能包括：<br>销售精英：<br>可以提升装备的售价。<br>节能环保：<br>可以减少打造所消耗的炉温。<br>推广引流：<br>可以提升顾客数量。<br>倾销货物：<br>可以提升顾客购买装备数量的上限。<br>制作大师：<br>打造高品质装备时满星的概率提升1%。<br>每当前一个技能提升至5级时解锁下一个技能强化选项。"
} }
}, },
{ {
@ -480,7 +480,7 @@
}, },
"content": { "content": {
"key": "ruledesc_ruledesc_content_44", "key": "ruledesc_ruledesc_content_44",
"text": "这里可以查看玩家游戏进度，并且可以修改名称与个性签名（名称最多20字符，汉字算2字符），更改角色装扮，还能修改并查看自己的阵容展示。" "text": "这里可以查看玩家游戏进度。<br>可以修改名称与个性签名（名称最多20字符，汉字算2字符）。<br>更改角色装扮，还能修改并查看自己的阵容展示。"
} }
} }
] ]

51
bin/json/game_skillafteratk.json
View File

@ -21606,32 +21606,6 @@
{ {
"Id": 244004311, "Id": 244004311,
"EmitPR": 1000, "EmitPR": 1000,
"From": 2,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
4000
],
"FollowSK": [
244004312,
244004313
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 244004312,
"EmitPR": 1000,
"From": 1, "From": 1,
"Where": [], "Where": [],
"Order": "", "Order": "",
@ -21653,6 +21627,31 @@
"RevisiCondition": "", "RevisiCondition": "",
"RevisiParams": [] "RevisiParams": []
}, },
{
"Id": 244004312,
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
3000
],
"FollowSK": [],
"SucFollowSK": [
244004313
],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{ {
"Id": 244004313, "Id": 244004313,
"EmitPR": 1000, "EmitPR": 1000,

9
bin/json/game_skillatk.json
View File

@ -16455,7 +16455,8 @@
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
244004311 244004311,
244004312
] ]
}, },
"Desc": { "Desc": {
@ -16487,7 +16488,8 @@
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
244004311 244004311,
244004312
] ]
}, },
"Desc": { "Desc": {
@ -16519,7 +16521,8 @@
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
244004311 244004311,
244004312
] ]
}, },
"Desc": { "Desc": {

100
bin/json/game_vikinglineup.json
View File

@ -3,300 +3,300 @@
"id": 1001, "id": 1001,
"robotid": 10001, "robotid": 10001,
"difficulty": 1, "difficulty": 1,
"time": 30 "time": 30000
}, },
{ {
"id": 1002, "id": 1002,
"robotid": 10002, "robotid": 10002,
"difficulty": 2, "difficulty": 2,
"time": 31 "time": 31000
}, },
{ {
"id": 1003, "id": 1003,
"robotid": 10003, "robotid": 10003,
"difficulty": 3, "difficulty": 3,
"time": 32 "time": 32000
}, },
{ {
"id": 1004, "id": 1004,
"robotid": 10004, "robotid": 10004,
"difficulty": 4, "difficulty": 4,
"time": 33 "time": 33000
}, },
{ {
"id": 1005, "id": 1005,
"robotid": 10005, "robotid": 10005,
"difficulty": 5, "difficulty": 5,
"time": 34 "time": 34000
}, },
{ {
"id": 1006, "id": 1006,
"robotid": 10006, "robotid": 10006,
"difficulty": 6, "difficulty": 6,
"time": 35 "time": 35000
}, },
{ {
"id": 1007, "id": 1007,
"robotid": 10007, "robotid": 10007,
"difficulty": 7, "difficulty": 7,
"time": 36 "time": 36000
}, },
{ {
"id": 1008, "id": 1008,
"robotid": 10008, "robotid": 10008,
"difficulty": 8, "difficulty": 8,
"time": 37 "time": 37000
}, },
{ {
"id": 1009, "id": 1009,
"robotid": 10009, "robotid": 10009,
"difficulty": 9, "difficulty": 9,
"time": 38 "time": 38000
}, },
{ {
"id": 1010, "id": 1010,
"robotid": 10010, "robotid": 10010,
"difficulty": 10, "difficulty": 10,
"time": 39 "time": 39000
}, },
{ {
"id": 2001, "id": 2001,
"robotid": 10011, "robotid": 10011,
"difficulty": 1, "difficulty": 1,
"time": 40 "time": 40000
}, },
{ {
"id": 2002, "id": 2002,
"robotid": 10012, "robotid": 10012,
"difficulty": 2, "difficulty": 2,
"time": 41 "time": 41000
}, },
{ {
"id": 2003, "id": 2003,
"robotid": 10013, "robotid": 10013,
"difficulty": 3, "difficulty": 3,
"time": 42 "time": 42000
}, },
{ {
"id": 2004, "id": 2004,
"robotid": 10014, "robotid": 10014,
"difficulty": 4, "difficulty": 4,
"time": 43 "time": 43000
}, },
{ {
"id": 2005, "id": 2005,
"robotid": 10015, "robotid": 10015,
"difficulty": 5, "difficulty": 5,
"time": 44 "time": 44000
}, },
{ {
"id": 2006, "id": 2006,
"robotid": 10016, "robotid": 10016,
"difficulty": 6, "difficulty": 6,
"time": 45 "time": 45000
}, },
{ {
"id": 2007, "id": 2007,
"robotid": 10017, "robotid": 10017,
"difficulty": 7, "difficulty": 7,
"time": 46 "time": 46000
}, },
{ {
"id": 2008, "id": 2008,
"robotid": 10018, "robotid": 10018,
"difficulty": 8, "difficulty": 8,
"time": 47 "time": 47000
}, },
{ {
"id": 2009, "id": 2009,
"robotid": 10019, "robotid": 10019,
"difficulty": 9, "difficulty": 9,
"time": 48 "time": 48000
}, },
{ {
"id": 2010, "id": 2010,
"robotid": 10020, "robotid": 10020,
"difficulty": 10, "difficulty": 10,
"time": 49 "time": 49000
}, },
{ {
"id": 3001, "id": 3001,
"robotid": 10021, "robotid": 10021,
"difficulty": 1, "difficulty": 1,
"time": 50 "time": 50000
}, },
{ {
"id": 3002, "id": 3002,
"robotid": 10022, "robotid": 10022,
"difficulty": 2, "difficulty": 2,
"time": 51 "time": 51000
}, },
{ {
"id": 3003, "id": 3003,
"robotid": 10023, "robotid": 10023,
"difficulty": 3, "difficulty": 3,
"time": 52 "time": 52000
}, },
{ {
"id": 3004, "id": 3004,
"robotid": 10024, "robotid": 10024,
"difficulty": 4, "difficulty": 4,
"time": 53 "time": 53000
}, },
{ {
"id": 3005, "id": 3005,
"robotid": 10025, "robotid": 10025,
"difficulty": 5, "difficulty": 5,
"time": 54 "time": 54000
}, },
{ {
"id": 3006, "id": 3006,
"robotid": 10026, "robotid": 10026,
"difficulty": 6, "difficulty": 6,
"time": 55 "time": 55000
}, },
{ {
"id": 3007, "id": 3007,
"robotid": 10027, "robotid": 10027,
"difficulty": 7, "difficulty": 7,
"time": 56 "time": 56000
}, },
{ {
"id": 3008, "id": 3008,
"robotid": 10028, "robotid": 10028,
"difficulty": 8, "difficulty": 8,
"time": 57 "time": 57000
}, },
{ {
"id": 3009, "id": 3009,
"robotid": 10029, "robotid": 10029,
"difficulty": 9, "difficulty": 9,
"time": 58 "time": 58000
}, },
{ {
"id": 3010, "id": 3010,
"robotid": 10030, "robotid": 10030,
"difficulty": 10, "difficulty": 10,
"time": 59 "time": 59000
}, },
{ {
"id": 11001, "id": 11001,
"robotid": 10031, "robotid": 10031,
"difficulty": 1, "difficulty": 1,
"time": 60 "time": 60000
}, },
{ {
"id": 11002, "id": 11002,
"robotid": 10032, "robotid": 10032,
"difficulty": 2, "difficulty": 2,
"time": 61 "time": 61000
}, },
{ {
"id": 11003, "id": 11003,
"robotid": 10033, "robotid": 10033,
"difficulty": 3, "difficulty": 3,
"time": 62 "time": 62000
}, },
{ {
"id": 11004, "id": 11004,
"robotid": 10034, "robotid": 10034,
"difficulty": 4, "difficulty": 4,
"time": 63 "time": 63000
}, },
{ {
"id": 11005, "id": 11005,
"robotid": 10035, "robotid": 10035,
"difficulty": 5, "difficulty": 5,
"time": 64 "time": 64000
}, },
{ {
"id": 11006, "id": 11006,
"robotid": 10036, "robotid": 10036,
"difficulty": 6, "difficulty": 6,
"time": 65 "time": 65000
}, },
{ {
"id": 11007, "id": 11007,
"robotid": 10037, "robotid": 10037,
"difficulty": 7, "difficulty": 7,
"time": 66 "time": 66000
}, },
{ {
"id": 11008, "id": 11008,
"robotid": 10038, "robotid": 10038,
"difficulty": 8, "difficulty": 8,
"time": 67 "time": 67000
}, },
{ {
"id": 11009, "id": 11009,
"robotid": 10039, "robotid": 10039,
"difficulty": 9, "difficulty": 9,
"time": 68 "time": 68000
}, },
{ {
"id": 11010, "id": 11010,
"robotid": 10040, "robotid": 10040,
"difficulty": 10, "difficulty": 10,
"time": 69 "time": 69000
}, },
{ {
"id": 21001, "id": 21001,
"robotid": 10041, "robotid": 10041,
"difficulty": 1, "difficulty": 1,
"time": 70 "time": 70000
}, },
{ {
"id": 21002, "id": 21002,
"robotid": 10042, "robotid": 10042,
"difficulty": 2, "difficulty": 2,
"time": 71 "time": 71000
}, },
{ {
"id": 21003, "id": 21003,
"robotid": 10043, "robotid": 10043,
"difficulty": 3, "difficulty": 3,
"time": 72 "time": 72000
}, },
{ {
"id": 21004, "id": 21004,
"robotid": 10044, "robotid": 10044,
"difficulty": 4, "difficulty": 4,
"time": 73 "time": 73000
}, },
{ {
"id": 21005, "id": 21005,
"robotid": 10045, "robotid": 10045,
"difficulty": 5, "difficulty": 5,
"time": 74 "time": 74000
}, },
{ {
"id": 21006, "id": 21006,
"robotid": 10046, "robotid": 10046,
"difficulty": 6, "difficulty": 6,
"time": 75 "time": 75000
}, },
{ {
"id": 21007, "id": 21007,
"robotid": 10047, "robotid": 10047,
"difficulty": 7, "difficulty": 7,
"time": 76 "time": 76000
}, },
{ {
"id": 21008, "id": 21008,
"robotid": 10048, "robotid": 10048,
"difficulty": 8, "difficulty": 8,
"time": 77 "time": 77000
}, },
{ {
"id": 21009, "id": 21009,
"robotid": 10049, "robotid": 10049,
"difficulty": 9, "difficulty": 9,
"time": 78 "time": 78000
}, },
{ {
"id": 21010, "id": 21010,
"robotid": 10050, "robotid": 10050,
"difficulty": 10, "difficulty": 10,
"time": 79 "time": 79000
} }
] ]

347
bin/json/game_worldtask.json
View File

File diff suppressed because it is too large Load Diff

4
modules/equipment/api_equip.go
View File

@ -79,10 +79,10 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq)
return return
} }
if minstar < confs[i].Color { if confs[i].Color < minstar {
minstar = confs[i].Color minstar = confs[i].Color
} }
if minlv < equipments[i].Lv { if equipments[i].Lv < minlv {
minlv = equipments[i].Lv minlv = equipments[i].Lv
} }
if suitconfs[i], err = this.module.configure.getEquipSuit(confs[i].Suittype); err != nil { if suitconfs[i], err = this.module.configure.getEquipSuit(confs[i].Suittype); err != nil {

4
modules/practice/api_info.go
View File

@ -75,8 +75,8 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.PracticeInfoReq) (e
if err = this.module.modelPandata.refreshnpc(room); err != nil { if err = this.module.modelPandata.refreshnpc(room); err != nil {
this.module.Errorln(err) this.module.Errorln(err)
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError, Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_DBError.ToString(), Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(), Message: err.Error(),
} }
return return

1
modules/practice/modelPandata.go
View File

@ -64,6 +64,7 @@ func (this *modelPandata) queryUserMartialhall(uid string) (result *pb.DBPractic
return return
} }
if err = this.module.atlas.CheckActivatePandaAtlasCollect(uid, "100001"); err != nil { if err = this.module.atlas.CheckActivatePandaAtlasCollect(uid, "100001"); err != nil {
this.module.Errorln(err)
return return
} }
} }