diff --git a/bin/json/game_chatsystem.json b/bin/json/game_chatsystem.json index bc5f644c1..d40af0557 100644 --- a/bin/json/game_chatsystem.json +++ b/bin/json/game_chatsystem.json @@ -3,6 +3,7 @@ "key": 1, "display": false, "type": 1, + "datatype": 0, "text": { "key": "chat_text_1", "text": "【system】 Good afternoon !" @@ -25,6 +26,7 @@ "key": 2, "display": false, "type": 1, + "datatype": 0, "text": { "key": "chat_text_2", "text": "【system】 Good afternoon !" @@ -45,6 +47,7 @@ "key": 3, "display": false, "type": 1, + "datatype": 0, "text": { "key": "chat_text_3", "text": "【system】 Good afternoon !" @@ -65,6 +68,7 @@ "key": 4, "display": false, "type": 2, + "datatype": 0, "text": { "key": "chat_text_4", "text": "【system】 Welcome Dream Works !" @@ -79,6 +83,7 @@ "key": 5, "display": true, "type": 3, + "datatype": 2, "text": { "key": "chat_text_5", "text": "【hearsay】%v through unremitting efforts, the %vhas been strengthened to level 13!" @@ -93,6 +98,7 @@ "key": 6, "display": true, "type": 3, + "datatype": 2, "text": { "key": "chat_text_6", "text": "【hearsay】%v through unremitting efforts, the %vhas been strengthened to level 14!" @@ -107,6 +113,7 @@ "key": 7, "display": true, "type": 3, + "datatype": 2, "text": { "key": "chat_text_7", "text": "【hearsay】%v through unremitting efforts, the %vhas been strengthened to level 15!" @@ -121,6 +128,7 @@ "key": 8, "display": false, "type": 4, + "datatype": 1, "text": { "key": "chat_text_8", "text": "【hearsay】%v breakthrough 100 floors of the tower!" @@ -135,6 +143,7 @@ "key": 9, "display": true, "type": 5, + "datatype": 0, "text": { "key": "chat_text_9", "text": "服务器即将维护,请及时下线避免数据丢失!" @@ -149,6 +158,7 @@ "key": 10, "display": true, "type": 6, + "datatype": 1, "text": { "key": "chat_text_10", "text": "【传闻】%v通关了赛季塔50层!" @@ -163,6 +173,7 @@ "key": 11, "display": true, "type": 7, + "datatype": 3, "text": { "key": "chat_text_11", "text": "【传闻】%v已经%v培养至60级!" @@ -177,6 +188,7 @@ "key": 12, "display": true, "type": 8, + "datatype": 3, "text": { "key": "chat_text_12", "text": "【传闻】%v已经%v培养至6星!" @@ -191,6 +203,7 @@ "key": 13, "display": true, "type": 9, + "datatype": 3, "text": { "key": "chat_text_13", "text": "【传闻】%v已经%v技能培养至满级!" @@ -205,6 +218,7 @@ "key": 14, "display": true, "type": 10, + "datatype": 3, "text": { "key": "chat_text_14", "text": "【传闻】%v已经%v共鸣至满级!" @@ -219,6 +233,7 @@ "key": 15, "display": true, "type": 11, + "datatype": 3, "text": { "key": "chat_text_15", "text": "【传闻】%v已经%v觉醒至满级!" @@ -233,6 +248,7 @@ "key": 16, "display": true, "type": 12, + "datatype": 1, "text": { "key": "chat_text_16", "text": "【传闻】%v已经达到了60级!" @@ -247,6 +263,7 @@ "key": 17, "display": true, "type": 13, + "datatype": 3, "text": { "key": "chat_text_17", "text": "【传闻】%v在招募中获得了v%!" @@ -261,6 +278,7 @@ "key": 18, "display": true, "type": 14, + "datatype": 1, "text": { "key": "chat_text_18", "text": "【传闻】%v通关了维京远征火焰泰坦难度10!" @@ -275,6 +293,7 @@ "key": 19, "display": true, "type": 14, + "datatype": 1, "text": { "key": "chat_text_19", "text": "【传闻】%v通关了维京远征冰霜泰坦难度10!" @@ -289,6 +308,7 @@ "key": 20, "display": true, "type": 14, + "datatype": 1, "text": { "key": "chat_text_20", "text": "【传闻】%v通关了维京远征森林泰坦难度10!" @@ -303,6 +323,7 @@ "key": 21, "display": true, "type": 14, + "datatype": 1, "text": { "key": "chat_text_21", "text": "【传闻】%v通关了维京远征冰霜泰坦(武器)难度10!" @@ -317,6 +338,7 @@ "key": 22, "display": true, "type": 14, + "datatype": 1, "text": { "key": "chat_text_22", "text": "【传闻】%v通关了维京远征森林泰坦(饰品)难度10!" @@ -331,6 +353,7 @@ "key": 23, "display": true, "type": 15, + "datatype": 1, "text": { "key": "chat_text_23", "text": "【传闻】%v通关了狩猎巨型猩猩难度10!" @@ -345,6 +368,7 @@ "key": 24, "display": true, "type": 15, + "datatype": 1, "text": { "key": "chat_text_24", "text": "【传闻】%v通关了狩猎火龙难度10!" @@ -359,6 +383,7 @@ "key": 25, "display": true, "type": 15, + "datatype": 1, "text": { "key": "chat_text_25", "text": "【传闻】%v通关了狩猎大厨难度10!" @@ -373,6 +398,7 @@ "key": 26, "display": true, "type": 15, + "datatype": 1, "text": { "key": "chat_text_26", "text": "【传闻】%v通关了狩猎太空海星难度10!" diff --git a/modules/equipment/api_upgrade.go b/modules/equipment/api_upgrade.go index f00949912..83fb9a976 100644 --- a/modules/equipment/api_upgrade.go +++ b/modules/equipment/api_upgrade.go @@ -189,7 +189,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade if user = this.module.ModuleUser.GetUser(session.GetUserId()); user != nil { // var color *cfg.GameGameColorData // if color, err = this.module.configure.GetColor(conf.Color); err == nil { - this.module.chat.SendSysChatToWorld(comm.ChatSystem5, equipment, equipment.Lv, 0, user.Name, conf.Id) + this.module.chat.SendSysChatToWorld(comm.ChatSystem3, equipment, equipment.Lv, 0, user.Name, conf.Id) // } else { // this.module.Errorf("GetColor err:%s", err.Error()) // } diff --git a/sys/configure/structs/game.chatSystemData.go b/sys/configure/structs/game.chatSystemData.go index 05d8d02fa..effb68e45 100644 --- a/sys/configure/structs/game.chatSystemData.go +++ b/sys/configure/structs/game.chatSystemData.go @@ -14,6 +14,7 @@ type GameChatSystemData struct { Key int32 Display bool Type int32 + Datatype int32 Text string Data int32 Data2 int32 @@ -32,6 +33,7 @@ func (_v *GameChatSystemData)Deserialize(_buf map[string]interface{}) (err error { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) } { var _ok_ bool; if _v.Display, _ok_ = _buf["display"].(bool); !_ok_ { err = errors.New("display error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["datatype"].(float64); !_ok_ { err = errors.New("datatype error"); return }; _v.Datatype = int32(_tempNum_) } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Text error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Text, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["data"].(float64); !_ok_ { err = errors.New("data error"); return }; _v.Data = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["data2"].(float64); !_ok_ { err = errors.New("data2 error"); return }; _v.Data2 = int32(_tempNum_) }