From 9e524a5286be4536c4a356332394b1de1d62b809 Mon Sep 17 00:00:00 2001 From: shoopea Date: Tue, 25 Jun 2019 18:23:42 +0800 Subject: [PATCH] test --- obj.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/obj.go b/obj.go index 4f0a8ca..450fc1d 100644 --- a/obj.go +++ b/obj.go @@ -649,7 +649,7 @@ func silentGetObjItemID(code string, name string) int64 { basename := r.ReplaceAllString(name, "${BaseName}") if v, ok := cacheObjItem.Load(basename); ok && len(basename) > 0 { item := v.(ChatWarsItem) - log.Printf("Matching item basename %s with %s.\n", basename, item.Name) + //log.Printf("Matching item full basename %s with %s.\n", basename, item.Name) return item.ObjID64 } item := ChatWarsItem{ @@ -660,8 +660,9 @@ func silentGetObjItemID(code string, name string) int64 { if ok, _ := regexp.MatchString(`^(a|e|w)[0-9]+$`, item.Code); !ok { //only gear can be custom named return true } - m := fmt.Sprintf("^(%s.*|.*%s)$", regexp.QuoteMeta(item.Name), regexp.QuoteMeta(item.Name)) + m := fmt.Sprintf("^((%s.*)|(.*%s))$", regexp.QuoteMeta(item.Name), regexp.QuoteMeta(item.Name)) if ok, _ := regexp.MatchString(m, basename); ok { + //log.Printf("Matching item modified basename %s with %s. (1)\n", basename, item.Name) return false } else { item = ChatWarsItem{ @@ -672,7 +673,7 @@ func silentGetObjItemID(code string, name string) int64 { }) if item.ObjID64 != 0 { - log.Printf("Matching item modified basename %s with %s.\n", basename, item.Name) + //log.Printf("Matching item modified basename %s with %s. (2)\n", basename, item.Name) return item.ObjID64 } else { fmt.Printf("silentGetObjItemID : Modifier : `%s`\n", r.ReplaceAllString(name, "${Modifier}"))