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:
meixiongfeng 2023-06-20 12:02:02 +08:00
commit 790f72b53d
11 changed files with 5192 additions and 5138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
bin/json/game_buriedcondi.json
View File

@ -16972,7 +16972,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_726",
"text": "击败恐惧灵"
"text": "击败豺狼小怪"
},
"type": 70,
"valid": 0,
@ -17259,7 +17259,7 @@
},
"type": 169,
"valid": 0,
"NPC": 0,
"NPC": -102,
"value": 1,
"filter": [
1
@ -17283,7 +17283,7 @@
},
"type": 43,
"valid": 0,
"NPC": 0,
"NPC": -102,
"value": 3,
"filter": [
3
@ -17519,7 +17519,7 @@
},
"type": 41,
"valid": 0,
"NPC": 0,
"NPC": -102,
"value": 6,
"filter": [
3
@ -17543,7 +17543,7 @@
},
"type": 43,
"valid": 0,
"NPC": 0,
"NPC": -102,
"value": 3,
"filter": [
6
@ -17712,7 +17712,7 @@
},
"type": 43,
"valid": 0,
"NPC": 0,
"NPC": -102,
"value": 6,
"filter": [
6
@ -17785,7 +17785,7 @@
},
"type": 43,
"valid": 0,
"NPC": 0,
"NPC": -102,
"value": 8,
"filter": [
3
@ -17809,7 +17809,7 @@
},
"type": 169,
"valid": 0,
"NPC": 0,
"NPC": -102,
"value": 1,
"filter": [
10
@ -17952,7 +17952,7 @@
},
"type": 43,
"valid": 0,
"NPC": 0,
"NPC": -102,
"value": 9,
"filter": [
6
@ -18767,7 +18767,7 @@
"key": "buried_buried_condi_tasktxt_801",
"text": "守护者回响解锁次数10次"
},
"type": 173,
"type": 199,
"valid": 0,
"NPC": 10754,
"value": 10,
@ -18789,7 +18789,7 @@
"key": "buried_buried_condi_tasktxt_802",
"text": "守护者回响解锁次数15次"
},
"type": 173,
"type": 199,
"valid": 0,
"NPC": 10764,
"value": 15,
@ -18904,12 +18904,12 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_807",
"text": "守护者回响解锁解锁30次"
"text": "守护者回响解锁解锁20次"
},
"type": 173,
"type": 199,
"valid": 0,
"NPC": 10814,
"value": 30,
"value": 20,
"filter": [],
"filter2": [
"0",
@ -19095,12 +19095,12 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_815",
"text": "守护者回响解锁50次"
"text": "守护者回响解锁25次"
},
"type": 173,
"type": 199,
"valid": 0,
"NPC": 10894,
"value": 50,
"value": 25,
"filter": [],
"filter2": [
"0",

20
bin/json/game_equipsuit.json
View File

@ -184,26 +184,6 @@
]
]
},
{
"suittype": 9,
"suitnum": 4,
"skill": 100009001,
"skillname": {
"key": "equip_equip_suit_skillname_9",
"text": "黄金包子套装"
},
"icon": "tz_icon_ms",
"FloatIcon": "ty_zd_buff_z007",
"simple_skillintr": {
"key": "equip_equip_suit_simple_skillintr_9",
"text": "额外行动"
},
"skillintr": {
"key": "equip_equip_suit_skillintr_9",
"text": "自身可行动时，有20%概率额外行动一次（仅触发一次，额外行动不会恢复技能冷却时间）"
},
"SetBonuses": []
},
{
"suittype": 10,
"suitnum": 2,

160
bin/json/game_item.json
View File

@ -394,7 +394,13 @@
"modelName": "",
"box_id": 0,
"synthetize_num": 3,
"synthetize_deplete": [],
"synthetize_deplete": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
],
"synthetize_get": [
{
"a": "item",
@ -439,7 +445,13 @@
"modelName": "",
"box_id": 0,
"synthetize_num": 3,
"synthetize_deplete": [],
"synthetize_deplete": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
],
"synthetize_get": [
{
"a": "item",
@ -447,7 +459,13 @@
"n": 1
}
],
"decompose_deplete": [],
"decompose_deplete": [
{
"a": "attr",
"t": "gold",
"n": 100
}
],
"decompose_get": [
{
"a": "item",
@ -492,7 +510,13 @@
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_deplete": [
{
"a": "attr",
"t": "gold",
"n": 100
}
],
"decompose_get": [
{
"a": "item",
@ -8354,7 +8378,13 @@
"modelName": "",
"box_id": 15000201,
"synthetize_num": 3,
"synthetize_deplete": [],
"synthetize_deplete": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
],
"synthetize_get": [
{
"a": "item",
@ -8399,7 +8429,13 @@
"modelName": "",
"box_id": 15000202,
"synthetize_num": 3,
"synthetize_deplete": [],
"synthetize_deplete": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
],
"synthetize_get": [
{
"a": "item",
@ -8444,7 +8480,13 @@
"modelName": "",
"box_id": 15000203,
"synthetize_num": 3,
"synthetize_deplete": [],
"synthetize_deplete": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
],
"synthetize_get": [
{
"a": "item",
@ -8489,7 +8531,13 @@
"modelName": "",
"box_id": 15000204,
"synthetize_num": 3,
"synthetize_deplete": [],
"synthetize_deplete": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
],
"synthetize_get": [
{
"a": "item",
@ -8534,7 +8582,13 @@
"modelName": "",
"box_id": 15000301,
"synthetize_num": 3,
"synthetize_deplete": [],
"synthetize_deplete": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
],
"synthetize_get": [
{
"a": "item",
@ -8542,7 +8596,13 @@
"n": 1
}
],
"decompose_deplete": [],
"decompose_deplete": [
{
"a": "attr",
"t": "gold",
"n": 100
}
],
"decompose_get": [
{
"a": "item",
@ -8585,7 +8645,13 @@
"modelName": "",
"box_id": 15000302,
"synthetize_num": 3,
"synthetize_deplete": [],
"synthetize_deplete": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
],
"synthetize_get": [
{
"a": "item",
@ -8593,7 +8659,13 @@
"n": 1
}
],
"decompose_deplete": [],
"decompose_deplete": [
{
"a": "attr",
"t": "gold",
"n": 100
}
],
"decompose_get": [
{
"a": "item",
@ -8636,7 +8708,13 @@
"modelName": "",
"box_id": 15000303,
"synthetize_num": 3,
"synthetize_deplete": [],
"synthetize_deplete": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
],
"synthetize_get": [
{
"a": "item",
@ -8644,7 +8722,13 @@
"n": 1
}
],
"decompose_deplete": [],
"decompose_deplete": [
{
"a": "attr",
"t": "gold",
"n": 100
}
],
"decompose_get": [
{
"a": "item",
@ -8687,7 +8771,13 @@
"modelName": "",
"box_id": 15000304,
"synthetize_num": 3,
"synthetize_deplete": [],
"synthetize_deplete": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
],
"synthetize_get": [
{
"a": "item",
@ -8695,7 +8785,13 @@
"n": 1
}
],
"decompose_deplete": [],
"decompose_deplete": [
{
"a": "attr",
"t": "gold",
"n": 100
}
],
"decompose_get": [
{
"a": "item",
@ -8740,7 +8836,13 @@
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_deplete": [
{
"a": "attr",
"t": "gold",
"n": 100
}
],
"decompose_get": [
{
"a": "item",
@ -8785,7 +8887,13 @@
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_deplete": [
{
"a": "attr",
"t": "gold",
"n": 100
}
],
"decompose_get": [
{
"a": "item",
@ -8830,7 +8938,13 @@
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_deplete": [
{
"a": "attr",
"t": "gold",
"n": 100
}
],
"decompose_get": [
{
"a": "item",
@ -8875,7 +8989,13 @@
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_deplete": [
{
"a": "attr",
"t": "gold",
"n": 100
}
],
"decompose_get": [
{
"a": "item",

768
bin/json/game_mainstage.json
View File

File diff suppressed because it is too large Load Diff

2
bin/json/game_mainstartype.json
View File

@ -10,7 +10,7 @@
"id": 2,
"starName": {
"key": "mainchapter_main_startype_starName_2",
"text": "死亡人数不超过{0}人"
"text": "被击败人数不超过{0}人"
}
},
{

8402
bin/json/game_monsterformat.json
View File

File diff suppressed because it is too large Load Diff

10
bin/json/game_rdtasknpc.json
View File

@ -622,7 +622,7 @@
"heroid": 25001,
"datas": [
"WuGuanScene",
"阿宝",
"20080_阿宝",
"137"
],
"event": [
@ -664,7 +664,7 @@
"heroid": 25001,
"datas": [
"WuGuanScene",
"阿宝",
"20080_阿宝",
"137"
],
"event": [
@ -1313,9 +1313,9 @@
"id": 10250,
"heroid": 25001,
"datas": [
"GameMain",
"20030_熊猫2",
"901"
"WuGuanScene",
"阿宝",
"137"
],
"event": [
2,

154
bin/json/game_smithytask.json
View File

@ -4,7 +4,7 @@
"id_list": 1,
"task_display": {
"key": "newsmithy_task_task_display_1",
"text": "进行1次普通招募"
"text": "累计18次普通招募"
},
"type_id": 2018001,
"reword": [
@ -25,7 +25,7 @@
"id_list": 2,
"task_display": {
"key": "newsmithy_task_task_display_2",
"text": "为任意守护者提升1次等级"
"text": "任意守护者提升24次等级"
},
"type_id": 2024001,
"reword": [
@ -42,11 +42,11 @@
]
},
{
"key": 10004,
"id_list": 4,
"key": 10003,
"id_list": 3,
"task_display": {
"key": "newsmithy_task_task_display_3",
"text": "强化任意装备成功1次"
"text": "累计强化装备成功47次"
},
"type_id": 2047001,
"reword": [
@ -63,13 +63,13 @@
]
},
{
"key": 10006,
"id_list": 6,
"key": 10004,
"id_list": 4,
"task_display": {
"key": "newsmithy_task_task_display_4",
"text": "在商店购买任意1件商品"
"text": "世界聊天发言62次"
},
"type_id": 2064001,
"type_id": 2062001,
"reword": [
{
"a": "attr",
@ -84,13 +84,13 @@
]
},
{
"key": 10007,
"id_list": 7,
"key": 10005,
"id_list": 5,
"task_display": {
"key": "newsmithy_task_task_display_5",
"text": "使用好友助战守护者战斗1次"
"text": "任意商品购买64次"
},
"type_id": 2012001,
"type_id": 2064001,
"reword": [
{
"a": "attr",
@ -105,11 +105,11 @@
]
},
{
"key": 10008,
"id_list": 8,
"key": 10006,
"id_list": 6,
"task_display": {
"key": "newsmithy_task_task_display_6",
"text": "进行竞技场挑战1次"
"text": "进行130次竞技场挑战"
},
"type_id": 2130001,
"reword": [
@ -126,13 +126,13 @@
]
},
{
"key": 10009,
"id_list": 9,
"key": 10007,
"id_list": 7,
"task_display": {
"key": "newsmithy_task_task_display_7",
"text": "进行10次普通招募"
"text": "累计登录8天"
},
"type_id": 3018001,
"type_id": 3008001,
"reword": [
{
"a": "attr",
@ -147,13 +147,13 @@
]
},
{
"key": 10010,
"id_list": 10,
"key": 10008,
"id_list": 8,
"task_display": {
"key": "newsmithy_task_task_display_8",
"text": "为任意守护者提升10次等级"
"text": "使用好友助战12次"
},
"type_id": 3024001,
"type_id": 3012001,
"reword": [
{
"a": "attr",
@ -163,18 +163,18 @@
{
"a": "attr",
"t": "diamond",
"n": 10
"n": 11
}
]
},
{
"key": 10011,
"id_list": 12,
"key": 10009,
"id_list": 9,
"task_display": {
"key": "newsmithy_task_task_display_9",
"text": "强化任意装备成功6次"
"text": "累计18次普通招募"
},
"type_id": 3047001,
"type_id": 3018001,
"reword": [
{
"a": "attr",
@ -184,18 +184,18 @@
{
"a": "attr",
"t": "diamond",
"n": 10
"n": 12
}
]
},
{
"key": 10012,
"id_list": 14,
"key": 10010,
"id_list": 10,
"task_display": {
"key": "newsmithy_task_task_display_10",
"text": "在商店购买任意7件商品"
"text": "任意守护者提升24次等级"
},
"type_id": 3064001,
"type_id": 3024001,
"reword": [
{
"a": "attr",
@ -205,91 +205,7 @@
{
"a": "attr",
"t": "diamond",
"n": 10
}
]
},
{
"key": 10013,
"id_list": 15,
"task_display": {
"key": "newsmithy_task_task_display_11",
"text": "使用好友助战守护者战斗7次"
},
"type_id": 3012001,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 20
},
{
"a": "attr",
"t": "diamond",
"n": 10
}
]
},
{
"key": 10014,
"id_list": 17,
"task_display": {
"key": "newsmithy_task_task_display_12",
"text": "刷新商店10次"
},
"type_id": 3105001,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 21
},
{
"a": "attr",
"t": "diamond",
"n": 10
}
]
},
{
"key": 10015,
"id_list": 18,
"task_display": {
"key": "newsmithy_task_task_display_13",
"text": "消费1000颗钻石"
},
"type_id": 3104001,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 22
},
{
"a": "attr",
"t": "diamond",
"n": 10
}
]
},
{
"key": 10016,
"id_list": 19,
"task_display": {
"key": "newsmithy_task_task_display_14",
"text": "进行30场竞技场挑战"
},
"type_id": 3130001,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 23
},
{
"a": "attr",
"t": "diamond",
"n": 10
"n": 13
}
]
}

728
bin/json/game_worldtask.json
View File

File diff suppressed because it is too large Load Diff

31
modules/user/model_user.go
View File

@ -258,6 +258,7 @@ func (this *ModelUser) ChangeLevel(event interface{}, next func(event interface{
)
curExp = ul.exp
for nextLvConf != nil && curExp >= int64(nextLvConf.Exp) {
curExp = curExp - int64(nextLvConf.Exp)
curLv++
@ -339,7 +340,22 @@ func (this *ModelUser) ChangeLevel(event interface{}, next func(event interface{
return
}
if err := ul.session.SendMsg(string(this.module.GetType()), "reschanged",
&pb.UserResChangedPush{Exp: curExp}); err != nil {
&pb.UserResChangedPush{
Gold: ul.Gold,
Ps: ul.Ps,
Vipexp: ul.vipexp,
Diamond: ul.Diamond,
Friend: ul.Friend,
Starcoin: ul.Starcoin,
Arenacoin: ul.Arenacoin,
Moongold: ul.Moongold,
Talent1: ul.Talent1,
Talent2: ul.Talent2,
Talent3: ul.Talent3,
Talent4: ul.Talent4,
Exp: curExp,
Merchantmoney: ul.Merchantmoney,
}); err != nil {
this.module.Error("玩家经验变化 UserResChangedPush推送失败",
log.Field{Key: "uid", Value: ul.session.GetUserId()},
log.Field{Key: "exp", Value: curExp},
@ -360,4 +376,17 @@ type UserListen struct {
name string
vipexp int64
viplv int32
Gold int64
Diamond int64
Friend int32
Starcoin int64
Guildcoin int64
Arenacoin int32
Ps int32
Moongold int32
Talent1 int32
Talent2 int32
Talent3 int32
Talent4 int32
Merchantmoney int32
}

9
modules/user/module.go
View File

@ -725,6 +725,15 @@ func (this *User) EventUserChanged(session comm.IUserSession) {
ul.exp = user.Exp
ul.lv = user.Lv
ul.name = user.Name
ul.Gold = user.Gold
ul.vipexp = user.Vipexp
ul.Ps = user.Ps
ul.Diamond = user.Diamond
ul.Merchantmoney = user.Merchantmoney
ul.Talent1 = user.Talent1
ul.Talent2 = user.Talent2
ul.Talent3 = user.Talent3
ul.Talent4 = user.Talent4
}
this.modelUser.EventApp.Dispatch(comm.EventUserChanged, ul)
}