From 072b8c43647be50dc37d3f38dd42b7f084fce348 Mon Sep 17 00:00:00 2001 From: huangxiaolei <1782360262@qq.com> Date: Fri, 2 Dec 2022 19:23:12 +0800 Subject: [PATCH] =?UTF-8?q?gs=E5=8A=A0=E8=BD=BD=E6=96=B0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gdconf/avatar_data.go | 1 + gdconf/avatar_skill_data.go | 1 + gdconf/game_data_config/csv/AvatarData.csv | 4 ++-- gdconf/game_data_config/csv/AvatarSkillData.csv | 4 ++-- gs/app/app.go | 2 ++ pkg/logger/logger.go | 5 +++++ 6 files changed, 13 insertions(+), 4 deletions(-) diff --git a/gdconf/avatar_data.go b/gdconf/avatar_data.go index 399816db..d574ed5b 100644 --- a/gdconf/avatar_data.go +++ b/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 diff --git a/gdconf/avatar_skill_data.go b/gdconf/avatar_skill_data.go index 1109a940..d2ececf8 100644 --- a/gdconf/avatar_skill_data.go +++ b/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"` // 消耗能量值 } diff --git a/gdconf/game_data_config/csv/AvatarData.csv b/gdconf/game_data_config/csv/AvatarData.csv index d79de73f..d14a91d1 100644 --- a/gdconf/game_data_config/csv/AvatarData.csv +++ b/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,ޡСҵĴС㡣ׯţϻּ͡ diff --git a/gdconf/game_data_config/csv/AvatarSkillData.csv b/gdconf/game_data_config/csv/AvatarSkillData.csv index 26c610a0..13d7f4e2 100644 --- a/gdconf/game_data_config/csv/AvatarSkillData.csv +++ b/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,,,,,, diff --git a/gs/app/app.go b/gs/app/app.go index 610f8665..1cb94493 100644 --- a/gs/app/app.go +++ b/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 { diff --git a/pkg/logger/logger.go b/pkg/logger/logger.go index aa7a54fc..753de269 100644 --- a/pkg/logger/logger.go +++ b/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) }