gs加载新配置表

gdconf/avatar_data.go

@@ -21,6 +21,7 @@ type AvatarData struct {
 	QualityType   int32   `csv:"QualityType,omitempty"`   // 角色品质
 	ConfigJson    string  `csv:"ConfigJson,omitempty"`    // 战斗config
 	InitialWeapon int32   `csv:"InitialWeapon,omitempty"` // 初始武器
+	WeaponType    int32   `csv:"WeaponType"`              // 武器种类
 	SkillDepotId  int32   `csv:"SkillDepotId,omitempty"`  // 技能库ID
 
 	AbilityHashCodeList []int32

gdconf/avatar_skill_data.go

@@ -10,6 +10,7 @@ import (
 
 type AvatarSkillData struct {
 	AvatarSkillId int32 `csv:"AvatarSkillId"`          // ID
+	CostStamina   int32 `csv:"CostStamina"`            // 消耗体力
 	CostElemType  int32 `csv:"CostElemType,omitempty"` // 消耗能量类型
 	CostElemVal   int32 `csv:"CostElemVal,omitempty"`  // 消耗能量值
 }

gdconf/game_data_config/csv/AvatarData.csv

@@ -1,5 +1,5 @@
-AvatarId,,,,,,,HpBase,AttackBase,DefenseBase,Critical,,CriticalHurt,,,,,,,,,,,,,,,,,,,,,,,,,,,QualityType,,,,ConfigJson,,InitialWeapon,,SkillDepotId,,,,,,,,
-int32,,,,,,,float64,float64,float64,float64,,float64,,,,,,,,,,,,,,,,,,,,,,,,,,,int32,,,,string,,int32,,int32,,,,,,,,
+AvatarId,,,,,,,HpBase,AttackBase,DefenseBase,Critical,,CriticalHurt,,,,,,,,,,,,,,,,,,,,,,,,,,,QualityType,,,,ConfigJson,,InitialWeapon,WeaponType,SkillDepotId,,,,,,,,
+int32,,,,,,,float64,float64,float64,float64,,float64,,,,,,,,,,,,,,,,,,,,,,,,,,,int32,,,,string,,int32,int32,int32,,,,,,,,
 ID,名称$text_name_Name,Prefab路径,Prefab_Remote路径,Controller路径,Controller_Remote路径,默认阵营,基础生命值,基础攻击力,基础防御力,暴击率,暴击抗性,暴击伤害,火元素抗性,草元素抗性,水元素抗性,电元素抗性,风元素抗性,冰元素抗性,岩元素抗性,火元素伤害加成,草元素伤害加成,水元素伤害加成,电元素伤害加成,风元素伤害加成,冰元素伤害加成,岩元素伤害加成,[属性成长]1类型,[属性成长]1曲线,[属性成长]2类型,[属性成长]2曲线,[属性成长]3类型,[属性成长]3曲线,元素精通,物理抗性,物理伤害加成,是否使用,反应暴击率,反应暴击伤害,角色品质,充能效率,治疗效果,受治疗效果,战斗config,是否远程射击角色,初始武器,武器种类,技能库ID,体力恢复速度,候选技能库ID,角色类型,角色突破ID,角色突破奖励获取等阶,角色突破奖励,特性组ID,描述$text_name_Desc
 10000001,凯特,ART/Char/Avatar/Avatar_Girl_Sword_Kate/Avatar_Girl_Sword_Kate,ART/Char/Avatar/Avatar_Girl_Sword_Kate/Avatar_Girl_Sword_Kate_Remote,ART/Char/Avatar/Avatar_Girl_Sword_Kate/Avatar_Girl_Sword_Kate,ART/Char/Avatar/Avatar_Girl_Sword_Kate/Avatar_Girl_Sword_Kate_Remote,,166,5,8,0.05,0,0.5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,22,4,32,7,22,0,0,0,0,0,1,4,1,0,0,ConfigAvatar_Kate,0,11101,1,101,25,,1,2,1;3;5,900011;900013;900015,10000001,
 10000002,神里绫华,ART/Char/Avatar/Avatar_Girl_Sword_Ayaka/Avatar_Girl_Sword_Ayaka,ART/Char/Avatar/Avatar_Girl_Sword_Ayaka/Avatar_Girl_Sword_Ayaka_Remote,ART/Char/Avatar/Avatar_Girl_Sword_Ayaka/Avatar_Girl_Sword_Ayaka,ART/Char/Avatar/Avatar_Girl_Sword_Ayaka/Avatar_Girl_Sword_Ayaka_Remote,,1000.986,26.6266,61.0266,0.05,0,0.5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,21,4,31,7,21,0,0,0,2,0,1,5,1,0,0,ConfigAvatar_Ayaka,0,11101,1,201,25,,1,2,1;3;5,900021;900023;900025,10000002,稻妻「社奉行」神里家的大小姐。端庄而文雅，聪慧又坚韧。

gdconf/game_data_config/csv/AvatarSkillData.csv

@@ -1,5 +1,5 @@
-AvatarSkillId,,,,,,CostElemType,CostElemVal,,,,,,,,,,,,,,,,,,,,
-int32,,,,,,int32,int32,,,,,,,,,,,,,,,,,,,,
+AvatarSkillId,,,,,CostStamina,CostElemType,CostElemVal,,,,,,,,,,,,,,,,,,,,
+int32,,,,,int32,int32,int32,,,,,,,,,,,,,,,,,,,,
 ID,Ability名称,是远程,技能CD,无视冷却缩减属性,消耗体力,消耗能量类型,消耗能量值,可累积次数,TriggerID,索敌范围,索敌公式权重1,索敌公式权重2,索敌公式权重3,索敌公式权重4,是默认镜头,支持按钮拖动,是否显示箭头,是否监控状态,默认锁定,图标名称,升级技能组ID,技能能量键值,消耗能量最小值,CanDoSkill为false强制可用,处理冷却所属技能槽,是否存档,shareCDID
 10001,,,0,,1,,,1,0,CircleLockEnemyR5H6HC,1,1,0.3,0,1,,,,,,0,,,,,,
 10002,,,0,,1,,,1,0,CircleLockEnemyR5H6HC,1,1,0.3,0,1,,,,,,0,,,,,,

gs/app/app.go

@@ -2,6 +2,7 @@ package app
 
 import (
 	"context"
+	"hk4e/gdconf"
 	_ "net/http/pprof"
 	"os"
 	"os/signal"
@@ -30,6 +31,7 @@ func Run(ctx context.Context, configFile string) error {
 	constant.InitConstant()
 
 	gdc.InitGameDataConfig()
+	gdconf.InitGameDataConfig()
 
 	conn, err := nats.Connect(config.CONF.MQ.NatsUrl)
 	if err != nil {

pkg/logger/logger.go

@@ -86,10 +86,13 @@ func (l *Logger) doLog() {
 		}
 		logStr := logHeader + fmt.Sprintf(logInfo.msg, logInfo.param...) + "\n"
 		red := string([]byte{27, 91, 51, 49, 109})
+		green := string([]byte{27, 91, 51, 50, 109})
 		reset := string([]byte{27, 91, 48, 109})
 		if l.method == CONSOLE {
 			if logInfo.logLevel == ERROR {
 				log.Print(red, logStr, reset)
+			} else if logInfo.logLevel == INFO {
+				log.Print(green, logStr, reset)
 			} else {
 				log.Print(logStr)
 			}
@@ -98,6 +101,8 @@ func (l *Logger) doLog() {
 		} else if l.method == BOTH {
 			if logInfo.logLevel == ERROR {
 				log.Print(red, logStr, reset)
+			} else if logInfo.logLevel == INFO {
+				log.Print(green, logStr, reset)
 			} else {
 				log.Print(logStr)
 			}