diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 50065ebe9..923d42f20 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -349,11 +349,11 @@ "key": "itemname_10009", "text": "被封印的魔法书" }, - "usetype": 3, + "usetype": 9, "color": 1, "bagtype": 1, "index": 9, - "special_type": 0, + "special_type": 5, "time": 0, "effects": "", "box_id": 0, @@ -392,11 +392,11 @@ "key": "itemname_10010", "text": "古代硬币" }, - "usetype": 3, + "usetype": 9, "color": 1, "bagtype": 1, "index": 10, - "special_type": 0, + "special_type": 5, "time": 0, "effects": "", "box_id": 0, @@ -435,11 +435,11 @@ "key": "itemname_10011", "text": "坏掉的钟表" }, - "usetype": 3, + "usetype": 9, "color": 2, "bagtype": 1, "index": 11, - "special_type": 0, + "special_type": 10, "time": 0, "effects": "", "box_id": 0, @@ -478,11 +478,11 @@ "key": "itemname_10012", "text": "木材" }, - "usetype": 3, + "usetype": 9, "color": 2, "bagtype": 1, "index": 12, - "special_type": 0, + "special_type": 10, "time": 0, "effects": "", "box_id": 0, @@ -521,11 +521,11 @@ "key": "itemname_10013", "text": "四叶草" }, - "usetype": 3, + "usetype": 9, "color": 3, "bagtype": 1, "index": 13, - "special_type": 0, + "special_type": 20, "time": 0, "effects": "", "box_id": 0, @@ -564,11 +564,11 @@ "key": "itemname_10014", "text": "冒险家勋章" }, - "usetype": 3, + "usetype": 9, "color": 4, "bagtype": 1, "index": 14, - "special_type": 0, + "special_type": 50, "time": 0, "effects": "", "box_id": 0, @@ -607,11 +607,11 @@ "key": "itemname_10015", "text": "猫猫护身符" }, - "usetype": 3, + "usetype": 9, "color": 5, "bagtype": 1, "index": 15, - "special_type": 0, + "special_type": 100, "time": 0, "effects": "", "box_id": 0, @@ -650,11 +650,11 @@ "key": "itemname_10016", "text": "人造钻石" }, - "usetype": 3, + "usetype": 9, "color": 6, "bagtype": 1, "index": 16, - "special_type": 0, + "special_type": 200, "time": 0, "effects": "", "box_id": 0, @@ -977,7 +977,7 @@ 109 ], "use_skip": 109, - "upper_limit": 999, + "upper_limit": -1, "uselv": 0, "isani": 0, "star": 0, @@ -1026,7 +1026,7 @@ 109 ], "use_skip": 109, - "upper_limit": 999, + "upper_limit": -1, "uselv": 0, "isani": 0, "star": 0, @@ -1075,7 +1075,7 @@ 109 ], "use_skip": 109, - "upper_limit": 999, + "upper_limit": -1, "uselv": 0, "isani": 0, "star": 0, @@ -1124,7 +1124,7 @@ 109 ], "use_skip": 109, - "upper_limit": 999, + "upper_limit": -1, "uselv": 0, "isani": 0, "star": 0, @@ -1173,7 +1173,7 @@ 109 ], "use_skip": 109, - "upper_limit": 999, + "upper_limit": -1, "uselv": 0, "isani": 0, "star": 0, @@ -1222,7 +1222,7 @@ 109 ], "use_skip": 109, - "upper_limit": 999, + "upper_limit": -1, "uselv": 0, "isani": 0, "star": 0, @@ -1271,7 +1271,7 @@ 109 ], "use_skip": 109, - "upper_limit": 999, + "upper_limit": -1, "uselv": 0, "isani": 0, "star": 0, @@ -1320,7 +1320,7 @@ 109 ], "use_skip": 109, - "upper_limit": 999, + "upper_limit": -1, "uselv": 0, "isani": 0, "star": 0, @@ -1369,7 +1369,7 @@ 109 ], "use_skip": 109, - "upper_limit": 999, + "upper_limit": -1, "uselv": 0, "isani": 0, "star": 0, @@ -1412,7 +1412,7 @@ 109 ], "use_skip": 109, - "upper_limit": 999, + "upper_limit": -1, "uselv": 0, "isani": 0, "star": 0, @@ -1455,7 +1455,7 @@ 109 ], "use_skip": 109, - "upper_limit": 999, + "upper_limit": -1, "uselv": 0, "isani": 0, "star": 0, @@ -1498,7 +1498,7 @@ 109 ], "use_skip": 109, - "upper_limit": 999, + "upper_limit": -1, "uselv": 0, "isani": 0, "star": 0, diff --git a/modules/chat/module.go b/modules/chat/module.go index 376d72919..c6f7010f9 100644 --- a/modules/chat/module.go +++ b/modules/chat/module.go @@ -11,6 +11,7 @@ import ( "go_dreamfactory/lego/utils/codec/json" "go_dreamfactory/modules" "go_dreamfactory/pb" + "go_dreamfactory/sys/configure" "time" "google.golang.org/protobuf/types/known/anypb" @@ -82,7 +83,7 @@ func (this *Chat) OnInstallComp() { //Event------------------------------------------------------------------------------------------------------------ func (this *Chat) EventUserOffline(session comm.IUserSession) { 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, Ctype: pb.ChatType_Text, Stag: this.service.GetTag(), - Ctime: time.Now().Unix(), + Ctime: configure.Now().Unix(), Content: fmt.Sprintf(st.Text, agrs...), Display: st.Display, } diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go index ed33692d0..a3eead735 100644 --- a/modules/hero/api_awaken.go +++ b/modules/hero/api_awaken.go @@ -67,6 +67,10 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c _hero.SameCount = 1 _hero.IsOverlying = false // 加属性 awakenData + if len(awakenData.Phasebonus) != 2 { + code = pb.ErrorCode_ConfigNoFound + return + } _value, ok := strconv.Atoi(awakenData.Phasebonus[0]) if ok == nil { // 升级技能 for pos, v := range _hero.NormalSkill { @@ -81,8 +85,10 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c } else { // 加属性 value, err := strconv.Atoi(awakenData.Phasebonus[1]) if err == nil { - this.module.modelHero.setJuexingProperty(_hero, awakenData.Phasebonus[0], int32(value)) - _heroMap["juexProperty"] = _hero.JuexProperty + if value > 0 { + this.module.modelHero.setJuexingProperty(_hero, awakenData.Phasebonus[0], int32(value)) + _heroMap["juexProperty"] = _hero.JuexProperty + } } } _hero.JuexingLv += 1 diff --git a/modules/items/api_useItem.go b/modules/items/api_useItem.go index 5ae37100c..ac65ed1bb 100644 --- a/modules/items/api_useItem.go +++ b/modules/items/api_useItem.go @@ -139,7 +139,7 @@ func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq) 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 } diff --git a/modules/moonfantasy/modelDream.go b/modules/moonfantasy/modelDream.go index 23cbf44ed..370ad77ee 100644 --- a/modules/moonfantasy/modelDream.go +++ b/modules/moonfantasy/modelDream.go @@ -127,6 +127,7 @@ func (this *modelDreamComp) trigger(session comm.IUserSession) { Avatar: user.Avatar, Uname: user.Name, Slv: user.Lv, + Ctime: configure.Now().Unix(), Stag: session.GetServiecTag(), Content: mdata.Monster, AppendStr: mdata.Id,