From 99dc3f32f762ca257d3cfc26ba675edfb959e6e1 Mon Sep 17 00:00:00 2001
From: shoopea <shoopea@siteop.biz>
Date: Fri, 7 Jun 2019 16:00:20 +0800
Subject: [PATCH] test

---
 obj.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/obj.go b/obj.go
index c774768..1ba28b4 100644
--- a/obj.go
+++ b/obj.go
@@ -526,7 +526,7 @@ func silentGetObjItemID(code string, name string) int64 {
 		return i.ObjID64
 	}
 	if ok, _ := regexp.MatchString(`(u|a|e)[0-9]+`, c); ok {
-		r := regexp.MustCompile(`^((?P<Modifier>⚡\+[0-9]+) ){0,1}(?P<BaseName>[a-zA-Z ']+?)( \+(?P<Atk>[0-9]+)⚔){0,1}( \+(?P<Def>[0-9]+)🛡){0,1}( \+(?P<Mana>[0-9]+)💧){0,1}$`)
+		r := regexp.MustCompile(`^((?P<Modifier>⚡\+[0-9]+) ){0,1}(?P<BaseName>.+?)( \+(?P<Atk>[0-9]+)⚔){0,1}( \+(?P<Def>[0-9]+)🛡){0,1}( \+(?P<Mana>[0-9]+)💧){0,1}$`)
 		n2 := r.ReplaceAllString(n, "${BaseName}")
 		if v, ok := cacheObjItem.Load(n2); ok {
 			i := v.(ChatWarsItem)
@@ -540,7 +540,7 @@ func silentGetObjItemID(code string, name string) int64 {
 
 	}
 	if len(c) == 0 {
-		r := regexp.MustCompile(`^((?P<Modifier>⚡\+[0-9]+) ){0,1}(?P<BaseName>[a-zA-Z ]+?)( \+(?P<Atk>[0-9]+)⚔){0,1}( \+(?P<Def>[0-9]+)🛡){0,1}( \+(?P<Mana>[0-9]+)💧){0,1}$`)
+		r := regexp.MustCompile(`^((?P<Modifier>⚡\+[0-9]+) ){0,1}(?P<BaseName>.+?)( \+(?P<Atk>[0-9]+)⚔){0,1}( \+(?P<Def>[0-9]+)🛡){0,1}( \+(?P<Mana>[0-9]+)💧){0,1}$`)
 		n2 := r.ReplaceAllString(n, "${BaseName}")
 		if v, ok := cacheObjItem.Load(n2); ok {
 			i := v.(ChatWarsItem)