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

modules/hero/api_buy.go

@@ -118,6 +118,10 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.HeroBuyReq) (code pb
 			this.module.ModuleRtask.SendToRtask(session, comm.Rtype67, v.N, utils.ToInt32(v.T))
 		}
 	}
-	session.SendMsg(string(this.module.GetType()), "buy", &pb.HeroBuyResp{IsSucc: true})
+	session.SendMsg(string(this.module.GetType()), "buy", &pb.HeroBuyResp{
+		IsSucc: true,
+		Onebuy: record.Onebuy + req.BuyCount,
+		Tenbuy: record.Tenbuy + req.BuyCount,
+	})
 	return
 }

modules/library/api_activationfetter.go

@@ -37,7 +37,7 @@ func (this *apiComp) ActivationFetter(session comm.IUserSession, req *pb.Library
 	mapData["activation"] = fetter.Activation
 	// 激活的时候算一下 当前羁绊等级
 	list := this.module.modelFetter.getHeroFetterList(session.GetUserId())
-	conf := this.configure.GetLibraryFetter(fetter.Fid, 1)
+	conf := this.module.configure.GetLibraryFetter(fetter.Fid, 1)
 	var minLv int32
 	for _, v1 := range conf.Hid {
 		for _, v := range list {

pb/hero_msg.pb.go

@@ -2181,7 +2181,9 @@ type HeroBuyResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	IsSucc bool `protobuf:"varint,1,opt,name=IsSucc,proto3" json:"IsSucc"`
+	IsSucc bool  `protobuf:"varint,1,opt,name=IsSucc,proto3" json:"IsSucc"`
+	Onebuy int32 `protobuf:"varint,3,opt,name=onebuy,proto3" json:"onebuy"` // 单次购买次数
+	Tenbuy int32 `protobuf:"varint,4,opt,name=tenbuy,proto3" json:"tenbuy"` // 十连购买次数
 }
 
 func (x *HeroBuyResp) Reset() {
@@ -2223,6 +2225,20 @@ func (x *HeroBuyResp) GetIsSucc() bool {
 	return false
 }
 
+func (x *HeroBuyResp) GetOnebuy() int32 {
+	if x != nil {
+		return x.Onebuy
+	}
+	return 0
+}
+
+func (x *HeroBuyResp) GetTenbuy() int32 {
+	if x != nil {
+		return x.Tenbuy
+	}
+	return 0
+}
+
 var File_hero_hero_msg_proto protoreflect.FileDescriptor
 
 var file_hero_hero_msg_proto_rawDesc = []byte{
@@ -2417,9 +2433,12 @@ var file_hero_hero_msg_proto_rawDesc = []byte{
 	0x0a, 0x07, 0x62, 0x75, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
 	0x07, 0x62, 0x75, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x75, 0x79, 0x43,
 	0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x75, 0x79, 0x43,
-	0x6f, 0x75, 0x6e, 0x74, 0x22, 0x25, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x75, 0x79, 0x52,
+	0x6f, 0x75, 0x6e, 0x74, 0x22, 0x55, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x75, 0x79, 0x52,
 	0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e,
+	0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x12, 0x16, 0x0a, 0x06, 0x6f,
+	0x6e, 0x65, 0x62, 0x75, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6f, 0x6e, 0x65,
+	0x62, 0x75, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x42, 0x06, 0x5a, 0x04, 0x2e,
 	0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 

sys/configure/structs/game.GourmetData.go

@@ -16,7 +16,7 @@ type GameGourmetData struct {
     SkillType int32
     Initial int32
     Level int32
-    ColourLevelAffix int32
+    ColourLevelAffix string
     Name string
     Needtime int32
     Display int32
@@ -24,7 +24,9 @@ type GameGourmetData struct {
     DeliciousIcon string
     SkillIcon string
     Item []*Gameatn
-    ItemColourAffix []int32
+    ItemColourAffix1 string
+    ItemColourAffix2 string
+    ItemColourAffix3 string
     DeliciousConsume []*Gameatn
     SkillConsume []*Gameatn
     Using int32
@@ -44,7 +46,7 @@ func (_v *GameGourmetData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill_type"].(float64); !_ok_ { err = errors.New("skill_type error"); return }; _v.SkillType = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["initial"].(float64); !_ok_ { err = errors.New("initial error"); return }; _v.Initial = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["level"].(float64); !_ok_ { err = errors.New("level error"); return }; _v.Level = int32(_tempNum_) }
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["colour_level_affix"].(float64); !_ok_ { err = errors.New("colour_level_affix error"); return }; _v.ColourLevelAffix = int32(_tempNum_) }
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["colour_level_affix"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ColourLevelAffix error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ColourLevelAffix, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["needtime"].(float64); !_ok_ { err = errors.New("needtime error"); return }; _v.Needtime = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["display"].(float64); !_ok_ { err = errors.New("display error"); return }; _v.Display = int32(_tempNum_) }
@@ -65,20 +67,9 @@ func (_v *GameGourmetData)Deserialize(_buf map[string]interface{}) (err error) {
                 }
             }
 
-     {
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["item_colour_affix1"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ItemColourAffix1 error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ItemColourAffix1, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
-                var _arr_ []interface{}
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["item_colour_affix2"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ItemColourAffix2 error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ItemColourAffix2, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
-                var _ok_ bool
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["item_colour_affix3"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ItemColourAffix3 error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ItemColourAffix3, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
-                if _arr_, _ok_ = _buf["item_colour_affix"].([]interface{}); !_ok_ { err = errors.New("item_colour_affix error"); return }
-
-                _v.ItemColourAffix = make([]int32, 0, len(_arr_))
-                
-                for _, _e_ := range _arr_ {
-                    var _list_v_ int32
-                    { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
-                    _v.ItemColourAffix = append(_v.ItemColourAffix, _list_v_)
-                }
-            }
-
      {
                 var _arr_ []interface{}
                 var _ok_ bool