From 0717d4e0ac8621071b587b6856ba825923cf994d Mon Sep 17 00:00:00 2001 From: shoopea Date: Thu, 6 Jun 2019 15:42:29 +0800 Subject: [PATCH] test --- obj.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/obj.go b/obj.go index 9902d82..313d59f 100644 --- a/obj.go +++ b/obj.go @@ -523,11 +523,12 @@ func silentGetObjItemID(c string, n string) int64 { return i.ObjID64 } if ok, _ := regexp.MatchString(`u[0-9]+`, c); ok { - r := regexp.MustCompile(`^((?P⚡\+[0-9]+) ){0,1}(?P[a-zA-Z ]+?)( \+(?P[0-9]+)⚔ \+(?P[0-9]+)🛡){0,1}$`) + r := regexp.MustCompile(`^((?P⚡\+[0-9]+) ){0,1}(?P[a-zA-Z ]+?)( \+(?P[0-9]+)⚔){0,1}( \+(?P[0-9]+)🛡){0,1}( \+(?P[0-9]+)💧){0,1}$`) fmt.Printf("silentGetObjItemID(unique) : Modifier : %s\n", r.ReplaceAllString(n, "${Modifier}")) fmt.Printf("silentGetObjItemID(unique) : BaseName : %s\n", r.ReplaceAllString(n, "${BaseName}")) fmt.Printf("silentGetObjItemID(unique) : Atk : %s\n", r.ReplaceAllString(n, "${Atk}")) fmt.Printf("silentGetObjItemID(unique) : Def : %s\n", r.ReplaceAllString(n, "${Def}")) + fmt.Printf("silentGetObjItemID(unique) : Mana : %s\n", r.ReplaceAllString(n, "${Mana}")) n2 := r.ReplaceAllString(n, "${BaseName}") if v, ok := cacheObjItem.Load(n2); ok { i := v.(ChatWarsItem) @@ -535,11 +536,12 @@ func silentGetObjItemID(c string, n string) int64 { } } if len(c) == 0 { - r := regexp.MustCompile(`^((?P⚡\+[0-9]+) ){0,1}(?P[a-zA-Z ]+?)( \+(?P[0-9]+)⚔ \+(?P[0-9]+)🛡){0,1}$`) + r := regexp.MustCompile(`^((?P⚡\+[0-9]+) ){0,1}(?P[a-zA-Z ]+?)( \+(?P[0-9]+)⚔){0,1}( \+(?P[0-9]+)🛡){0,1}( \+(?P[0-9]+)💧){0,1}$`) fmt.Printf("silentGetObjItemID(null) : Modifier : %s\n", r.ReplaceAllString(n, "${Modifier}")) fmt.Printf("silentGetObjItemID(null) : BaseName : %s\n", r.ReplaceAllString(n, "${BaseName}")) fmt.Printf("silentGetObjItemID(null) : Atk : %s\n", r.ReplaceAllString(n, "${Atk}")) fmt.Printf("silentGetObjItemID(null) : Def : %s\n", r.ReplaceAllString(n, "${Def}")) + fmt.Printf("silentGetObjItemID(null) : Mana : %s\n", r.ReplaceAllString(n, "${Mana}")) n2 := r.ReplaceAllString(n, "${BaseName}") if v, ok := cacheObjItem.Load(n2); ok { i := v.(ChatWarsItem)