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:
wh_zcy 2022-11-22 11:03:00 +08:00
commit e94c8058bf
5 changed files with 41 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
bin/json/game_item.json
View File

@ -349,11 +349,11 @@
"key": "itemname_10009", "key": "itemname_10009",
"text": "被封印的魔法书" "text": "被封印的魔法书"
}, },
"usetype": 3, "usetype": 9,
"color": 1, "color": 1,
"bagtype": 1, "bagtype": 1,
"index": 9, "index": 9,
"special_type": 0, "special_type": 5,
"time": 0, "time": 0,
"effects": "", "effects": "",
"box_id": 0, "box_id": 0,
@ -392,11 +392,11 @@
"key": "itemname_10010", "key": "itemname_10010",
"text": "古代硬币" "text": "古代硬币"
}, },
"usetype": 3, "usetype": 9,
"color": 1, "color": 1,
"bagtype": 1, "bagtype": 1,
"index": 10, "index": 10,
"special_type": 0, "special_type": 5,
"time": 0, "time": 0,
"effects": "", "effects": "",
"box_id": 0, "box_id": 0,
@ -435,11 +435,11 @@
"key": "itemname_10011", "key": "itemname_10011",
"text": "坏掉的钟表" "text": "坏掉的钟表"
}, },
"usetype": 3, "usetype": 9,
"color": 2, "color": 2,
"bagtype": 1, "bagtype": 1,
"index": 11, "index": 11,
"special_type": 0, "special_type": 10,
"time": 0, "time": 0,
"effects": "", "effects": "",
"box_id": 0, "box_id": 0,
@ -478,11 +478,11 @@
"key": "itemname_10012", "key": "itemname_10012",
"text": "木材" "text": "木材"
}, },
"usetype": 3, "usetype": 9,
"color": 2, "color": 2,
"bagtype": 1, "bagtype": 1,
"index": 12, "index": 12,
"special_type": 0, "special_type": 10,
"time": 0, "time": 0,
"effects": "", "effects": "",
"box_id": 0, "box_id": 0,
@ -521,11 +521,11 @@
"key": "itemname_10013", "key": "itemname_10013",
"text": "四叶草" "text": "四叶草"
}, },
"usetype": 3, "usetype": 9,
"color": 3, "color": 3,
"bagtype": 1, "bagtype": 1,
"index": 13, "index": 13,
"special_type": 0, "special_type": 20,
"time": 0, "time": 0,
"effects": "", "effects": "",
"box_id": 0, "box_id": 0,
@ -564,11 +564,11 @@
"key": "itemname_10014", "key": "itemname_10014",
"text": "冒险家勋章" "text": "冒险家勋章"
}, },
"usetype": 3, "usetype": 9,
"color": 4, "color": 4,
"bagtype": 1, "bagtype": 1,
"index": 14, "index": 14,
"special_type": 0, "special_type": 50,
"time": 0, "time": 0,
"effects": "", "effects": "",
"box_id": 0, "box_id": 0,
@ -607,11 +607,11 @@
"key": "itemname_10015", "key": "itemname_10015",
"text": "猫猫护身符" "text": "猫猫护身符"
}, },
"usetype": 3, "usetype": 9,
"color": 5, "color": 5,
"bagtype": 1, "bagtype": 1,
"index": 15, "index": 15,
"special_type": 0, "special_type": 100,
"time": 0, "time": 0,
"effects": "", "effects": "",
"box_id": 0, "box_id": 0,
@ -650,11 +650,11 @@
"key": "itemname_10016", "key": "itemname_10016",
"text": "人造钻石" "text": "人造钻石"
}, },
"usetype": 3, "usetype": 9,
"color": 6, "color": 6,
"bagtype": 1, "bagtype": 1,
"index": 16, "index": 16,
"special_type": 0, "special_type": 200,
"time": 0, "time": 0,
"effects": "", "effects": "",
"box_id": 0, "box_id": 0,
@ -977,7 +977,7 @@
109 109
], ],
"use_skip": 109, "use_skip": 109,
"upper_limit": 999, "upper_limit": -1,
"uselv": 0, "uselv": 0,
"isani": 0, "isani": 0,
"star": 0, "star": 0,
@ -1026,7 +1026,7 @@
109 109
], ],
"use_skip": 109, "use_skip": 109,
"upper_limit": 999, "upper_limit": -1,
"uselv": 0, "uselv": 0,
"isani": 0, "isani": 0,
"star": 0, "star": 0,
@ -1075,7 +1075,7 @@
109 109
], ],
"use_skip": 109, "use_skip": 109,
"upper_limit": 999, "upper_limit": -1,
"uselv": 0, "uselv": 0,
"isani": 0, "isani": 0,
"star": 0, "star": 0,
@ -1124,7 +1124,7 @@
109 109
], ],
"use_skip": 109, "use_skip": 109,
"upper_limit": 999, "upper_limit": -1,
"uselv": 0, "uselv": 0,
"isani": 0, "isani": 0,
"star": 0, "star": 0,
@ -1173,7 +1173,7 @@
109 109
], ],
"use_skip": 109, "use_skip": 109,
"upper_limit": 999, "upper_limit": -1,
"uselv": 0, "uselv": 0,
"isani": 0, "isani": 0,
"star": 0, "star": 0,
@ -1222,7 +1222,7 @@
109 109
], ],
"use_skip": 109, "use_skip": 109,
"upper_limit": 999, "upper_limit": -1,
"uselv": 0, "uselv": 0,
"isani": 0, "isani": 0,
"star": 0, "star": 0,
@ -1271,7 +1271,7 @@
109 109
], ],
"use_skip": 109, "use_skip": 109,
"upper_limit": 999, "upper_limit": -1,
"uselv": 0, "uselv": 0,
"isani": 0, "isani": 0,
"star": 0, "star": 0,
@ -1320,7 +1320,7 @@
109 109
], ],
"use_skip": 109, "use_skip": 109,
"upper_limit": 999, "upper_limit": -1,
"uselv": 0, "uselv": 0,
"isani": 0, "isani": 0,
"star": 0, "star": 0,
@ -1369,7 +1369,7 @@
109 109
], ],
"use_skip": 109, "use_skip": 109,
"upper_limit": 999, "upper_limit": -1,
"uselv": 0, "uselv": 0,
"isani": 0, "isani": 0,
"star": 0, "star": 0,
@ -1412,7 +1412,7 @@
109 109
], ],
"use_skip": 109, "use_skip": 109,
"upper_limit": 999, "upper_limit": -1,
"uselv": 0, "uselv": 0,
"isani": 0, "isani": 0,
"star": 0, "star": 0,
@ -1455,7 +1455,7 @@
109 109
], ],
"use_skip": 109, "use_skip": 109,
"upper_limit": 999, "upper_limit": -1,
"uselv": 0, "uselv": 0,
"isani": 0, "isani": 0,
"star": 0, "star": 0,
@ -1498,7 +1498,7 @@
109 109
], ],
"use_skip": 109, "use_skip": 109,
"upper_limit": 999, "upper_limit": -1,
"uselv": 0, "uselv": 0,
"isani": 0, "isani": 0,
"star": 0, "star": 0,

5
modules/chat/module.go
View File

@ -11,6 +11,7 @@ import (
"go_dreamfactory/lego/utils/codec/json" "go_dreamfactory/lego/utils/codec/json"
"go_dreamfactory/modules" "go_dreamfactory/modules"
"go_dreamfactory/pb" "go_dreamfactory/pb"
"go_dreamfactory/sys/configure"
"time" "time"
"google.golang.org/protobuf/types/known/anypb" "google.golang.org/protobuf/types/known/anypb"
@ -82,7 +83,7 @@ func (this *Chat) OnInstallComp() {
//Event------------------------------------------------------------------------------------------------------------ //Event------------------------------------------------------------------------------------------------------------
func (this *Chat) EventUserOffline(session comm.IUserSession) { func (this *Chat) EventUserOffline(session comm.IUserSession) {
if err := this.modelChat.removeCrossChannelMember(session); err != nil { if err := this.modelChat.removeCrossChannelMember(session); err != nil {
this.Debug("EventUserOffline:", log.Fields{ "uid": session.GetUserId(),"err":err.Error()}) this.Debug("EventUserOffline:", log.Fields{"uid": session.GetUserId(), "err": err.Error()})
} }
} }
@ -226,7 +227,7 @@ func (this *Chat) SendSysChatToWorld(ctype comm.ChatSystemType, appenddata inter
Channel: pb.ChatChannel_System, Channel: pb.ChatChannel_System,
Ctype: pb.ChatType_Text, Ctype: pb.ChatType_Text,
Stag: this.service.GetTag(), Stag: this.service.GetTag(),
Ctime: time.Now().Unix(), Ctime: configure.Now().Unix(),
Content: fmt.Sprintf(st.Text, agrs...), Content: fmt.Sprintf(st.Text, agrs...),
Display: st.Display, Display: st.Display,
} }

10
modules/hero/api_awaken.go
View File

@ -67,6 +67,10 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c
_hero.SameCount = 1 _hero.SameCount = 1
_hero.IsOverlying = false _hero.IsOverlying = false
// 加属性 awakenData // 加属性 awakenData
if len(awakenData.Phasebonus) != 2 {
code = pb.ErrorCode_ConfigNoFound
return
}
_value, ok := strconv.Atoi(awakenData.Phasebonus[0]) _value, ok := strconv.Atoi(awakenData.Phasebonus[0])
if ok == nil { // 升级技能 if ok == nil { // 升级技能
for pos, v := range _hero.NormalSkill { for pos, v := range _hero.NormalSkill {
@ -81,8 +85,10 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c
} else { // 加属性 } else { // 加属性
value, err := strconv.Atoi(awakenData.Phasebonus[1]) value, err := strconv.Atoi(awakenData.Phasebonus[1])
if err == nil { if err == nil {
this.module.modelHero.setJuexingProperty(_hero, awakenData.Phasebonus[0], int32(value)) if value > 0 {
_heroMap["juexProperty"] = _hero.JuexProperty this.module.modelHero.setJuexingProperty(_hero, awakenData.Phasebonus[0], int32(value))
_heroMap["juexProperty"] = _hero.JuexProperty
}
} }
} }
_hero.JuexingLv += 1 _hero.JuexingLv += 1

2
modules/items/api_useItem.go
View File

@ -139,7 +139,7 @@ func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq)
N: v.N * int32(req.Amount), N: v.N * int32(req.Amount),
}) })
} }
if code = this.module.ConsumeRes(session, itemcf.SynthetizeDeplete, true); code != pb.ErrorCode_Success { if code = this.module.ConsumeRes(session, sale, true); code != pb.ErrorCode_Success {
return return
} }

1
modules/moonfantasy/modelDream.go
View File

@ -127,6 +127,7 @@ func (this *modelDreamComp) trigger(session comm.IUserSession) {
Avatar: user.Avatar, Avatar: user.Avatar,
Uname: user.Name, Uname: user.Name,
Slv: user.Lv, Slv: user.Lv,
Ctime: configure.Now().Unix(),
Stag: session.GetServiecTag(), Stag: session.GetServiecTag(),
Content: mdata.Monster, Content: mdata.Monster,
AppendStr: mdata.Id, AppendStr: mdata.Id,