test
This commit is contained in:
parent
0ea4d57c18
commit
b4d10cc6eb
28
obj.go
28
obj.go
@ -598,42 +598,40 @@ func getObjItemID(c string, n string) int64 {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func silentGetObjItemID(code string, name string) int64 {
|
func silentGetObjItemID(code string, name string) int64 {
|
||||||
c := code
|
if v, ok := cacheObjItem.Load(code); ok && len(code) > 0 {
|
||||||
n := name
|
|
||||||
if v, ok := cacheObjItem.Load(c); ok {
|
|
||||||
i := v.(ChatWarsItem)
|
i := v.(ChatWarsItem)
|
||||||
return i.ObjID64
|
return i.ObjID64
|
||||||
}
|
}
|
||||||
if v, ok := cacheObjItem.Load(n); ok {
|
if v, ok := cacheObjItem.Load(name); ok && len(name) > 0 {
|
||||||
i := v.(ChatWarsItem)
|
i := v.(ChatWarsItem)
|
||||||
return i.ObjID64
|
return i.ObjID64
|
||||||
}
|
}
|
||||||
if ok, _ := regexp.MatchString(`^((u|e)[0-9]+|(a|w)[0-9]+[a-e]{0,1})$`, c); ok || len(c) == 0 {
|
if ok, _ := regexp.MatchString(`^((u|e)[0-9]+|(a|w)[0-9]+[a-e]{0,1})$`, code); ok || len(code) == 0 {
|
||||||
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}$`)
|
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}")
|
basename := r.ReplaceAllString(name, "${BaseName}")
|
||||||
if v, ok := cacheObjItem.Load(n2); ok {
|
if v, ok := cacheObjItem.Load(basename); ok && len(basename) > 0 {
|
||||||
i := v.(ChatWarsItem)
|
i := v.(ChatWarsItem)
|
||||||
return i.ObjID64
|
return i.ObjID64
|
||||||
}
|
}
|
||||||
i := ChatWarsItem{}
|
item := ChatWarsItem{}
|
||||||
cacheObjItem.Range(func(k, v interface{}) bool {
|
cacheObjItem.Range(func(k, v interface{}) bool {
|
||||||
i = v.(ChatWarsItem)
|
item = v.(ChatWarsItem)
|
||||||
if ok, _ := regexp.MatchString(`^(a|e|w)[0-9]+$`, i.Code); !ok { //only gear can be custom named
|
if ok, _ := regexp.MatchString(`^(a|e|w)[0-9]+$`, item.Code); !ok { //only gear can be custom named
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
m := fmt.Sprintf("^(%s.*|.*%s)$", regexp.QuoteMeta(i.Name), regexp.QuoteMeta(i.Name))
|
m := fmt.Sprintf("^(%s.*|.*%s)$", regexp.QuoteMeta(item.Name), regexp.QuoteMeta(item.Name))
|
||||||
if ok, _ := regexp.MatchString(m, n2); ok {
|
if ok, _ := regexp.MatchString(m, basename); ok {
|
||||||
return false
|
return false
|
||||||
} else {
|
} else {
|
||||||
i = ChatWarsItem{
|
item = ChatWarsItem{
|
||||||
ObjID64: 0,
|
ObjID64: 0,
|
||||||
}
|
}
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
})
|
})
|
||||||
if i.ObjID64 != 0 {
|
if item.ObjID64 != 0 {
|
||||||
return i.ObjID64
|
return item.ObjID64
|
||||||
} else {
|
} else {
|
||||||
fmt.Printf("silentGetObjItemID : Modifier : `%s`\n", r.ReplaceAllString(n, "${Modifier}"))
|
fmt.Printf("silentGetObjItemID : Modifier : `%s`\n", r.ReplaceAllString(n, "${Modifier}"))
|
||||||
fmt.Printf("silentGetObjItemID : BaseName : `%s`\n", r.ReplaceAllString(n, "${BaseName}"))
|
fmt.Printf("silentGetObjItemID : BaseName : `%s`\n", r.ReplaceAllString(n, "${BaseName}"))
|
||||||
|
Loading…
Reference in New Issue
Block a user