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

modules/comp_configure.go

@@ -20,6 +20,7 @@ const (
 	game_facemod   = "game_facemod.json"   //形象配置表
 	game_drop      = "game_drop.json"      //掉落
 	game_comatn    = "game_comatn.json"    //atn配置表
+	new_hero       = "game_hero.json"
 )
 
 ///配置管理基础组件
@@ -35,11 +36,13 @@ func (this *MCompConfigure) Init(service core.IService, module core.IModule, com
 	err = this.LoadConfigure(game_global, cfg.NewGameGlobal)
 	err = this.LoadConfigure(game_initial, cfg.NewGameInitial)
 	err = this.LoadConfigure(game_gamecolor, cfg.NewGameGameColor)
+	err = this.LoadConfigure(new_hero, cfg.NewGameHero)
 	err = this.LoadConfigure(game_playerlv, cfg.NewGamePlayerlv)
 	err = this.LoadConfigure(game_facemod, cfg.NewGameFacemod)
 	err = this.LoadConfigure(game_comatn, cfg.NewGameComAtn)
 	this._dropMap = make(map[int32][]*cfg.GameDropData, 0)
 	configure.RegisterConfigure(game_drop, cfg.NewGameDrop, this.LoadDropData)
+
 	return
 }
 func (this *MCompConfigure) LoadConfigure(name string, fn interface{}) (err error) {
@@ -247,3 +250,15 @@ func (this *MCompConfigure) GetColor(id int32) (item *cfg.GameGameColorData, err
 	}
 	return
 }
+
+// 获取英雄原始星级
+func (this *MCompConfigure) GetHeroConfigStar(heroCfgId string) int32 {
+	if v, err := this.GetConfigure(new_hero); err == nil {
+		if configure, ok := v.(*cfg.GameHero); ok {
+			if v, ok := configure.GetDataMap()[heroCfgId]; ok {
+				return v.Star
+			}
+		}
+	}
+	return 0
+}

modules/hero/api_awaken.go

@@ -107,7 +107,7 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c
 	//任务相关
 	this.module.ModuleRtask.SendToRtask(session, comm.Rtype34, 1, _hero.JuexingLv)
 	this.module.ModuleRtask.SendToRtask(session, comm.Rtype35, _hero.JuexingLv, utils.ToInt32(_hero.HeroID))
-	cfg := this.module.configure.GetHero(_hero.HeroID)
+	cfg := this.module.configure.GetHeroConfig(_hero.HeroID)
 	if cfg != nil {
 		this.module.ModuleRtask.SendToRtask(session, comm.Rtype36, 1, cfg.Color, cfg.Job, cfg.Race, _hero.JuexingLv)
 		//xx英雄满级、共鸣、觉醒至最高状态

modules/hero/api_resonance.go

@@ -40,7 +40,7 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR
 		return
 	}
 	//获取原始星级
-	conf := this.module.configure.GetHero(_hero.HeroID)
+	conf := this.module.configure.GetHeroConfig(_hero.HeroID)
 	if conf == nil {
 		code = pb.ErrorCode_ConfigNoFound
 		return
@@ -151,7 +151,7 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR
 	// 任务相关
 	this.module.ModuleRtask.SendToRtask(session, comm.Rtype39, 1)
 	this.module.ModuleRtask.SendToRtask(session, comm.Rtype40, 1, 1)
-	cfg := this.module.configure.GetHero(_hero.HeroID)
+	cfg := this.module.configure.GetHeroConfig(_hero.HeroID)
 	if cfg != nil {
 		this.module.ModuleRtask.SendToRtask(session, comm.Rtype36, 1, cfg.Color, cfg.Job, cfg.Race, _hero.JuexingLv)
 		//xx英雄满级、共鸣、觉醒至最高状态

modules/hero/api_resonanceReset.go

@@ -40,7 +40,7 @@ func (this *apiComp) ResonanceReset(session comm.IUserSession, req *pb.HeroReson
 
 	// 共鸣次数判断
 	//获取原始星级
-	conf := this.module.configure.GetHero(_hero.HeroID)
+	conf := this.module.configure.GetHeroConfig(_hero.HeroID)
 	if conf == nil {
 		code = pb.ErrorCode_ConfigNoFound
 		return

modules/hero/api_resonanceSelect.go

@@ -63,7 +63,7 @@ func (this *apiComp) ResonanceUseEnergy(session comm.IUserSession, req *pb.HeroR
 		this.module.Errorf("update hero skill failed:%v", err1)
 		return
 	}
-	conf := this.module.configure.GetHero(_hero.HeroID)
+	conf := this.module.configure.GetHeroConfig(_hero.HeroID)
 	// 计算属性
 	this.module.modelHero.setEnergyProperty(_hero, conf.Star)
 	session.SendMsg(string(this.module.GetType()), ResonanceUseEnergy, &pb.HeroResonanceUseEnergyResp{Hero: _hero})

modules/hero/api_strengthenUpSkill.go

@@ -42,7 +42,7 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt
 		return
 	}
 	// 查询配置表 找出原始品质
-	heroCfg := this.module.configure.GetHero(_hero.HeroID)
+	heroCfg := this.module.configure.GetHeroConfig(_hero.HeroID)
 	if heroCfg == nil {
 		code = pb.ErrorCode_HeroNoExist
 		return
@@ -65,7 +65,7 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt
 			code = pb.ErrorCode_HeroNoEnough
 			return
 		}
-		tmp := this.module.configure.GetHero(costHero.HeroID) // 星级校验
+		tmp := this.module.configure.GetHeroConfig(costHero.HeroID) // 星级校验
 		if tmp.Color != heroCfg.Color {
 			code = pb.ErrorCode_HeroColorErr
 			return
@@ -178,7 +178,7 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt
 		this.module.ModuleRtask.SendToRtask(session, comm.Rtype54, 1)
 		this.module.ModuleRtask.SendToRtask(session, comm.Rtype57, 1)
 	}
-	cfg := this.module.configure.GetHero(_hero.HeroID)
+	cfg := this.module.configure.GetHeroConfig(_hero.HeroID)
 	if cfg != nil {
 		this.module.ModuleRtask.SendToRtask(session, comm.Rtype55, cfg.Color, 1)
 		this.module.ModuleRtask.SendToRtask(session, comm.Rtype56, 1, 1, cfg.Job)

modules/hero/api_strengthenUpStar.go

@@ -89,7 +89,7 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr
 
 			for _, value := range starConf.Needrace { // 阵营校验
 				// 获取配置表英雄阵营
-				cfg := this.module.configure.GetHero(tagHero.HeroID)
+				cfg := this.module.configure.GetHeroConfig(tagHero.HeroID)
 				if cfg != nil {
 					if cfg.Race == value {
 						costRaceHeroCount += v

modules/hero/configure_comp.go

@@ -35,12 +35,14 @@ type configureComp struct {
 	awakenMap    map[int64]*cfg.GameHeroAwakenData
 	resonanceMap map[int64]*cfg.GameHeroResonanceData
 	starMap      map[int64]*cfg.GameHeroStarupData
+	module       *Hero
 }
 
 //组件初始化接口
 func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
 
 	err = this.MCompConfigure.Init(service, module, comp, options)
+	this.module = module.(*Hero)
 	err = this.LoadMultiConfigure(map[string]interface{}{
 		new_hero:       cfg.NewGameHero,
 		hero_stargrow:  cfg.NewGameHeroStargrow,
@@ -85,7 +87,6 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
 		}
 	})
 	// 升星
-	//:    cfg.,
 	this.starMap = make(map[int64]*cfg.GameHeroStarupData, 0)
 	configure.RegisterConfigure(hero_starup, cfg.NewGameHeroStarup, func() {
 		if v, err := this.GetConfigure(hero_starup); err == nil {
@@ -100,6 +101,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
 			err = fmt.Errorf("%T no is *cfg.Game_drawCard", v)
 		}
 	})
+
 	return
 }
 
@@ -148,23 +150,6 @@ func (this *configureComp) GetPollByType(poosType string) map[int32][]*cfg.GameD
 	return this.drawCardCfg[poosType]
 }
 
-//获取英雄配置数据
-func (this *configureComp) getHeroConfigure() (configure *cfg.GameHero, err error) {
-	var (
-		v  interface{}
-		ok bool
-	)
-
-	if v, err = this.GetConfigure(new_hero); err != nil {
-		return
-	} else {
-		if configure, ok = v.(*cfg.GameHero); !ok {
-			err = fmt.Errorf("%T no is *cfg.GameHero", v)
-		}
-	}
-	return
-}
-
 // 获取英雄强化增加属性配置数据
 func (this *configureComp) GetHeroStargrowConfig() (configure *cfg.GameHeroStargrow, err error) {
 	var (
@@ -281,14 +266,16 @@ func (this *configureComp) GetHeroStargrow() (configure *cfg.GameHeroStargrow, e
 }
 
 //获取英雄配置
-func (this *configureComp) GetHero(heroCfgId string) *cfg.GameHeroData {
+func (this *configureComp) GetHeroConfig(heroCfgId string) *cfg.GameHeroData {
-	cfg, err := this.getHeroConfigure()
+	if v, err := this.GetConfigure(new_hero); err == nil {
-	if err != nil {
+
-		return nil
+		if configure, ok := v.(*cfg.GameHero); ok {
-	}
+			if v, ok := configure.GetDataMap()[heroCfgId]; ok {
-	if v, ok := cfg.GetDataMap()[heroCfgId]; ok {
+				return v
-		return v
+			}
+		}
 	}
+	this.module.Errorf("config no is *cfg.GameHero")
 	return nil
 }
 

modules/hero/model_hero.go

@@ -38,7 +38,7 @@ func (this *ModelHero) Init(service core.IService, module core.IModule, comp cor
 
 //初始化英雄
 func (this *ModelHero) InitHero(uid string, heroCfgId string) *pb.DBHero {
-	heroCfg := this.moduleHero.configure.GetHero(heroCfgId)
+	heroCfg := this.moduleHero.configure.GetHeroConfig(heroCfgId)
 	if heroCfg == nil {
 		this.moduleHero.Errorf("%v hero not found from config %v", heroCfgId)
 		return nil
@@ -69,7 +69,7 @@ func (this *ModelHero) InitHero(uid string, heroCfgId string) *pb.DBHero {
 
 //初始化英雄技能
 func (this *ModelHero) initHeroSkill(hero *pb.DBHero) []*pb.SkillData {
-	heroCfg := this.moduleHero.configure.GetHero(hero.HeroID)
+	heroCfg := this.moduleHero.configure.GetHeroConfig(hero.HeroID)
 	if heroCfg != nil {
 		if heroCfg.Skill != 0 {
 			hero.CaptainSkill = heroCfg.Skill
@@ -423,7 +423,7 @@ func (this *ModelHero) PropertyCompute(hero *pb.DBHero) {
 	}
 
 	//英雄基础配置 newhero
-	heroCfg := this.moduleHero.configure.GetHero(hero.HeroID)
+	heroCfg := this.moduleHero.configure.GetHeroConfig(hero.HeroID)
 	if heroCfg == nil {
 		return
 	}
@@ -579,7 +579,7 @@ func (this *ModelHero) AddCardExp(session comm.IUserSession, hero *pb.DBHero, ex
 			this.moduleHero.ModuleRtask.SendToRtask(session, comm.Rtype23, 1, hero.Star, hero.Lv)
 			this.moduleHero.ModuleRtask.SendToRtask(session, comm.Rtype24, 1)
 			this.moduleHero.ModuleRtask.SendToRtask(session, comm.Rtype29, 1, hero.Lv, utils.ToInt32(hero.HeroID))
-			cfg := this.moduleHero.configure.GetHero(hero.HeroID)
+			cfg := this.moduleHero.configure.GetHeroConfig(hero.HeroID)
 			if cfg != nil {
 				this.moduleHero.ModuleRtask.SendToRtask(session, comm.Rtype32, 1, cfg.Color, hero.Lv)
 				this.moduleHero.ModuleRtask.SendToRtask(session, comm.Rtype36, 1, cfg.Color, cfg.Job, cfg.Race, hero.JuexingLv)
@@ -668,7 +668,7 @@ func (this *ModelHero) GetRandHeroIdBypool(sz []int32) int32 {
 }
 
 func (this *ModelHero) InitTempHero(heroCfgId string, star, lv int32) *pb.DBHero {
-	heroCfg := this.moduleHero.configure.GetHero(heroCfgId)
+	heroCfg := this.moduleHero.configure.GetHeroConfig(heroCfgId)
 	if heroCfg == nil {
 		this.moduleHero.Errorf("%v hero not found from config %v", heroCfgId)
 		return nil

modules/hero/module.go

@@ -96,7 +96,7 @@ func (this *Hero) CreateRepeatHero(session comm.IUserSession, heroCfgId string,
 		// 统计任务
 		this.ModuleRtask.SendToRtask(session, comm.Rtype1, utils.ToInt32(heroCfgId))
 		// 查品质
-		cfg := this.configure.GetHero(heroCfgId)
+		cfg := this.configure.GetHeroConfig(heroCfgId)
 		if cfg != nil {
 
 			this.ModuleRtask.SendToRtask(session, comm.Rtype30, 1, cfg.Color)
@@ -255,7 +255,7 @@ func (this *Hero) CreateRepeatHeros(session comm.IUserSession, heros map[string]
 		}
 		changeHero = append(changeHero, hero)
 		// 查品质
-		cfg := this.configure.GetHero(heroCfgId)
+		cfg := this.configure.GetHeroConfig(heroCfgId)
 		if cfg != nil {
 
 			this.ModuleRtask.SendToRtask(session, comm.Rtype30, 1, cfg.Color)

modules/library/api_usegift.go

@@ -18,7 +18,10 @@ func (this *apiComp) UseGiftCheck(session comm.IUserSession, req *pb.LibraryUseG
 
 func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftReq) (code pb.ErrorCode, data proto.Message) {
 	var (
-		res []*cfg.Gameatn
+		res      []*cfg.Gameatn
+		totalExp int32
+		curStar  int32 // 配置表星级
+		maxLv    int32 // 羁绊最大等级
 	)
 	code = this.UseGiftCheck(session, req)
 	if code != pb.ErrorCode_Success {
@@ -30,17 +33,58 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe
 		code = pb.ErrorCode_HeroNoExist // 没找到对应的英雄信息
 		return
 	}
+	// 查询该英雄原始的星级
+	curStar = this.configure.GetHeroConfigStar(_heroObj.Heroid)
+	if curStar == 0 {
+		code = pb.ErrorCode_ConfigNoFound
+		return
+	}
+	favorConf := this.configure.GetLibraryFavor(curStar)
+	maxLv = int32(len(favorConf)) // 获取当前星级羁绊最大等级
+	// 达到最大等级不让继续升级
+	if _heroObj.Favorlv >= maxLv {
+		code = pb.ErrorCode_LibraryMaxLv
+		return
+	}
 	for k, v := range req.Items { // 校验数量
 		res = append(res, &cfg.Gameatn{
 			A: "item",
 			T: k,
 			N: v,
 		})
+		expConf := this.configure.GetFavorNum(k)
+		if expConf == nil {
+			code = pb.ErrorCode_ConfigNoFound
+			return
+		}
+		totalExp += expConf.FavorNum
 	}
 	if code = this.module.CheckRes(session, res); code != pb.ErrorCode_Success { // 道具不够直接返回
 		return
 	}
 
+	_heroObj.Favorexp += totalExp
+	// 折算出等级
+	for {
+		if _heroObj.Favorlv >= maxLv { // 达到最大等级不让继续升级
+			code = pb.ErrorCode_LibraryMaxLv
+			break
+		}
+		if favorConf[_heroObj.Favorlv] <= _heroObj.Favorexp {
+			_heroObj.Favorexp -= favorConf[_heroObj.Favorlv]
+			_heroObj.Favorlv += 1
+		} else {
+			break
+		}
+	}
+	if code = this.module.ConsumeRes(session, res, true); code != pb.ErrorCode_Success { //真正消耗
+		return
+	}
+	// 修改信息
+	mapData := make(map[string]interface{})
+	mapData["favorexp"] = _heroObj.Favorexp
+	mapData["favorlv"] = _heroObj.Favorlv
+	this.module.modelFetter.modifyHeroFetterDataByObjId(session.GetUserId(), _heroObj.Id, mapData)
 	session.SendMsg(string(this.module.GetType()), LibraryUseGiftResp, rsp)
 
 	return

modules/library/comp_configure.go

@@ -36,15 +36,8 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
 	})
 
 	this.fetter = make(map[int64]*cfg.GameLibraryFetterData, 0)
-
 	configure.RegisterConfigure(game_libraryfetter, cfg.NewGameLibraryFetter, this.SetLibraryFetter)
 
-	_data := this.GetFavorNum("10016")
-	fmt.Printf("%v", _data)
-	_data1 := this.GetLibraryFavor(3)
-	fmt.Printf("%v", _data1)
-	// _data2 := this.GetLibraryHistory("350011")
-	// fmt.Printf("%v", _data2)
 	return
 }
 
@@ -92,11 +85,14 @@ func (this *configureComp) GetLibraryHero(hid string) (data *cfg.GameLibraryHero
 	return
 }
 
+// 获取当前星级的好感度
 func (this *configureComp) GetLibraryFavor(star int32) (data []int32) {
 	if v, err := this.GetConfigure(game_libraryfavor); err == nil {
 		if configure, ok := v.(*cfg.GameLibraryFavor); ok {
 			for _, v := range configure.GetDataList() {
-				data = append(data, v.Expneed)
+				if v.Star == star {
+					data = append(data, v.Expneed)
+				}
 			}
 		}
 	} else {

pb/errorcode.pb.go

@@ -189,6 +189,8 @@ const (
 	ErrorCode_HuntingBoosType          ErrorCode = 2702 // BOSS 类型不对
 	ErrorCode_HuntingBuyMaxCount       ErrorCode = 2703 // 购买达到最大次数
 	ErrorCode_HuntingMaxChallengeCount ErrorCode = 2704 // 挑战达到最大次数
+	// library
+	ErrorCode_LibraryMaxLv ErrorCode = 2801 // 达到最大等级
 )
 
 // Enum value maps for ErrorCode.
@@ -344,8 +346,10 @@ var (
 		2702: "HuntingBoosType",
 		2703: "HuntingBuyMaxCount",
 		2704: "HuntingMaxChallengeCount",
+		2801: "LibraryMaxLv",
 	}
 	ErrorCode_value = map[string]int32{
+<<<<<<< HEAD
 		"Success":                     0,
 		"NoFindService":               10,
 		"NoFindServiceHandleFunc":     11,
@@ -496,6 +500,158 @@ var (
 		"HuntingBoosType":             2702,
 		"HuntingBuyMaxCount":          2703,
 		"HuntingMaxChallengeCount":    2704,
+=======
+		"Success":                    0,
+		"NoFindService":              10,
+		"NoFindServiceHandleFunc":    11,
+		"RpcFuncExecutionError":      12,
+		"CacheReadError":             13,
+		"SqlExecutionError":          14,
+		"ReqParameterError":          15,
+		"SignError":                  16,
+		"InsufficientPermissions":    17,
+		"NoLogin":                    18,
+		"UserSessionNobeing":         19,
+		"StateInvalid":               20,
+		"DBError":                    21,
+		"SystemError":                22,
+		"DecodeError":                23,
+		"TimestampTimeout":           24,
+		"PbError":                    25,
+		"AgentUidEmpty":              26,
+		"Exception":                  100,
+		"Unknown":                    101,
+		"ResNoEnough":                102,
+		"ConfigurationException":     103,
+		"ConfigNoFound":              104,
+		"UserLogined":                105,
+		"SecKeyInvalid":              1000,
+		"SecKey":                     1001,
+		"BindUser":                   1002,
+		"GoldNoEnough":               1003,
+		"DiamondNoEnough":            1004,
+		"RoleCreated":                1005,
+		"UserNickNameExist":          1006,
+		"VeriCodeNoValid":            1007,
+		"VeriCodeExpired":            1008,
+		"UserResetData":              1009,
+		"UserModiNameCount":          1010,
+		"UserNickNameEmpty":          1011,
+		"UserExpandNull":             1012,
+		"UserExpNoEnough":            1013,
+		"UserFriendNoEnough":         1014,
+		"FriendNotSelf":              1100,
+		"FriendSelfMax":              1101,
+		"FriendTargetMax":            1102,
+		"FriendSelfNoData":           1103,
+		"FriendTargetNoData":         1104,
+		"FriendYet":                  1105,
+		"FriendApplyYet":             1106,
+		"FriendSelfBlackYet":         1107,
+		"FriendTargetBlackYet":       1108,
+		"FriendApplyError":           1109,
+		"FriendBlackMax":             1110,
+		"FriendSearchNameEmpty":      1111,
+		"FriendZaned":                1112,
+		"FriendZanreceived":          1113,
+		"FriendZanSelf":              1114,
+		"FriendPointLimit":           1115,
+		"FriendNoreceived":           1116,
+		"ItemsNoEnough":              1200,
+		"ItemsNoFoundGird":           1201,
+		"ItemsGridNumUpper":          1202,
+		"ItemsGirdAmountUpper":       1203,
+		"ItemsUseNotSupported":       1204,
+		"ItemsUseNoCanSell":          1205,
+		"HeroNoExist":                1300,
+		"HeroNoEnough":               1301,
+		"HeroMaxLv":                  1302,
+		"HeroInitCreat":              1303,
+		"HeroColorErr":               1304,
+		"HeroSkillUpErr":             1305,
+		"HeroMaxResonate":            1306,
+		"HeroNoResonate":             1307,
+		"HeroNotNeedResonate":        1308,
+		"HeroNoEnergy":               1309,
+		"HeroCreate":                 1310,
+		"HeroEquipUpdate":            1311,
+		"HeroMaxAwaken":              1312,
+		"HeroIsLock":                 1313,
+		"HeroMaxCount":               1314,
+		"HeroCostTypeErr":            1315,
+		"HeroStarErr":                1316,
+		"HeroTypeErr":                1317,
+		"HeroExpTypeErr":             1318,
+		"HeroAddMaxExp":              1319,
+		"HeroStarLvErr":              1320,
+		"HeroMaxStarLv":              1321,
+		"DrawCardTypeNotFound":       1322,
+		"HeroMaxSkillLv":             1323,
+		"HeroAlreadyKongFuStatus":    1324,
+		"EquipmentOnFoundEquipment":  1400,
+		"EquipmentLvlimitReached":    1401,
+		"EquipmentIsWorn":            1402,
+		"EquipmentNoCanSell":         1403,
+		"MainlineNotFindChapter":     1500,
+		"MainlineIDFailed":           1501,
+		"MainlineNotFound":           1502,
+		"MainlinePreNotFound":        1503,
+		"MainlineRepeatReward":       1504,
+		"MainlineCompleteReward":     1505,
+		"TaskInit":                   1600,
+		"TaskReset":                  1601,
+		"TaskHandle":                 1602,
+		"TaskReceived":               1603,
+		"TaskActiveInit":             1604,
+		"TaskActiveNofound":          1605,
+		"TaskActiveNoenough":         1606,
+		"TaskNoFinished":             1607,
+		"TaskFinished":               1608,
+		"TaskTagEmpty":               1609,
+		"TaskIdEmpty":                1610,
+		"TaskNotFound":               1611,
+		"ShopGoodsIsSoldOut":         1700,
+		"ShopNoSurplusRefreshNum":    1701,
+		"MailErr":                    1800,
+		"PagodaNotFound":             1900,
+		"PagodaLevlErr":              1901,
+		"PagodaGetRewardErr":         1902,
+		"PagodaConditionErr":         1903,
+		"MartialhallNotUnlocked":     2000,
+		"MartialhallInUse":           2001,
+		"MartialhallUnlocked":        2002,
+		"MartialhallNoUnlocked":      2003,
+		"GourmetMoreOrderTime":       2101,
+		"GourmetSkillMaxLv":          2102,
+		"RtaskFinished":              2201,
+		"RtaskUnFinished":            2202,
+		"RtaskNoRtask":               2203,
+		"RtaskRewarded":              2204,
+		"RtaskPreNoFinish":           2205,
+		"RtaskCondiNoReach":          2206,
+		"RtaskNoLastOne":             2207,
+		"RtaskCondiNoFound":          2208,
+		"VikingLvErr":                2301,
+		"VikingBoosType":             2302,
+		"VikingBuyMaxCount":          2303,
+		"VikingMaxChallengeCount":    2304,
+		"MoonfantasyHasExpired":      2401,
+		"MoonfantasyJoinUp":          2402,
+		"MoonfantasyDareUp":          2403,
+		"MoonfantasyBattleNoEnd":     2404,
+		"MoonfantasyBattleNoWin":     2405,
+		"MoonfantasyNoJoin":          2406,
+		"BattleNoFoundRecord":        2501,
+		"LinestoryTaskFinished":      2601,
+		"LinestorySubTaskFinished":   2602,
+		"LinestoryTaskDisabledEnter": 2603,
+		"LinestoryPreTaskNoFinished": 2604,
+		"HuntingLvErr":               2701,
+		"HuntingBoosType":            2702,
+		"HuntingBuyMaxCount":         2703,
+		"HuntingMaxChallengeCount":   2704,
+		"LibraryMaxLv":               2801,
+>>>>>>> eca5c2e75084237207d94a603395b841cb9ed435
 	}
 )
 
@@ -530,7 +686,11 @@ var File_errorcode_proto protoreflect.FileDescriptor
 
 var file_errorcode_proto_rawDesc = []byte{
 	0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+<<<<<<< HEAD
 	0x6f, 0x2a, 0x90, 0x1a, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+=======
+	0x6f, 0x2a, 0x81, 0x1a, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+>>>>>>> eca5c2e75084237207d94a603395b841cb9ed435
 	0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d,
 	0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x10, 0x0a, 0x12,
 	0x1b, 0x0a, 0x17, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
@@ -721,6 +881,7 @@ var file_errorcode_proto_rawDesc = []byte{
 	0x6e, 0x64, 0x10, 0xe4, 0x12, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e,
 	0x74, 0x61, 0x73, 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x57, 0x69, 0x6e, 0x10,
 	0xe5, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73,
+<<<<<<< HEAD
 	0x79, 0x4e, 0x6f, 0x4a, 0x6f, 0x69, 0x6e, 0x10, 0xe6, 0x12, 0x12, 0x20, 0x0a, 0x1b, 0x4d, 0x6f,
 	0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75,
 	0x67, 0x68, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x73, 0x10, 0xe7, 0x12, 0x12, 0x18, 0x0a, 0x13,
@@ -741,6 +902,27 @@ var file_errorcode_proto_rawDesc = []byte{
 	0x4d, 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e,
 	0x74, 0x10, 0x90, 0x15, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x33,
+=======
+	0x79, 0x4e, 0x6f, 0x4a, 0x6f, 0x69, 0x6e, 0x10, 0xe6, 0x12, 0x12, 0x18, 0x0a, 0x13, 0x42, 0x61,
+	0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x6f, 0x72,
+	0x64, 0x10, 0xc5, 0x13, 0x12, 0x1a, 0x0a, 0x15, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72,
+	0x79, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xa9, 0x14,
+	0x12, 0x1d, 0x0a, 0x18, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x53, 0x75, 0x62,
+	0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xaa, 0x14, 0x12,
+	0x1f, 0x0a, 0x1a, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b,
+	0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x10, 0xab, 0x14,
+	0x12, 0x1f, 0x0a, 0x1a, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x50, 0x72, 0x65,
+	0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xac,
+	0x14, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4c, 0x76, 0x45, 0x72,
+	0x72, 0x10, 0x8d, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42,
+	0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x10, 0x8e, 0x15, 0x12, 0x17, 0x0a, 0x12, 0x48, 0x75,
+	0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74,
+	0x10, 0x8f, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4d, 0x61,
+	0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10,
+	0x90, 0x15, 0x12, 0x11, 0x0a, 0x0c, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4d, 0x61, 0x78,
+	0x4c, 0x76, 0x10, 0xf1, 0x15, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
+>>>>>>> eca5c2e75084237207d94a603395b841cb9ed435
 }
 
 var (