chtwrs/chirpnest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test

Browse Source
This commit is contained in:
shoopea 2019-06-06 15:42:29 +08:00
parent 0bf1230036
commit 0717d4e0ac
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
obj.go
View File

@ -523,11 +523,12 @@ func silentGetObjItemID(c string, n string) int64 {
return i.ObjID64 return i.ObjID64
} }
if ok, _ := regexp.MatchString(`u[0-9]+`, c); ok { if ok, _ := regexp.MatchString(`u[0-9]+`, c); ok {
r := regexp.MustCompile(`^((?P<Modifier>⚡\+[0-9]+) ){0,1}(?P<BaseName>[a-zA-Z ]+?)( \+(?P<Atk>[0-9]+)⚔ \+(?P<Def>[0-9]+)🛡){0,1}$`) 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}$`)
fmt.Printf("silentGetObjItemID(unique) : Modifier : %s\n", r.ReplaceAllString(n, "${Modifier}")) 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) : BaseName : %s\n", r.ReplaceAllString(n, "${BaseName}"))
fmt.Printf("silentGetObjItemID(unique) : Atk : %s\n", r.ReplaceAllString(n, "${Atk}")) 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) : Def : %s\n", r.ReplaceAllString(n, "${Def}"))
fmt.Printf("silentGetObjItemID(unique) : Mana : %s\n", r.ReplaceAllString(n, "${Mana}"))
n2 := r.ReplaceAllString(n, "${BaseName}") n2 := r.ReplaceAllString(n, "${BaseName}")
if v, ok := cacheObjItem.Load(n2); ok { if v, ok := cacheObjItem.Load(n2); ok {
i := v.(ChatWarsItem) i := v.(ChatWarsItem)
@ -535,11 +536,12 @@ func silentGetObjItemID(c string, n string) int64 {
} }
} }
if len(c) == 0 { if len(c) == 0 {
r := regexp.MustCompile(`^((?P<Modifier>⚡\+[0-9]+) ){0,1}(?P<BaseName>[a-zA-Z ]+?)( \+(?P<Atk>[0-9]+)⚔ \+(?P<Def>[0-9]+)🛡){0,1}$`) 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}$`)
fmt.Printf("silentGetObjItemID(null) : Modifier : %s\n", r.ReplaceAllString(n, "${Modifier}")) 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) : BaseName : %s\n", r.ReplaceAllString(n, "${BaseName}"))
fmt.Printf("silentGetObjItemID(null) : Atk : %s\n", r.ReplaceAllString(n, "${Atk}")) 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) : Def : %s\n", r.ReplaceAllString(n, "${Def}"))
fmt.Printf("silentGetObjItemID(null) : Mana : %s\n", r.ReplaceAllString(n, "${Mana}"))
n2 := r.ReplaceAllString(n, "${BaseName}") n2 := r.ReplaceAllString(n, "${BaseName}")
if v, ok := cacheObjItem.Load(n2); ok { if v, ok := cacheObjItem.Load(n2); ok {
i := v.(ChatWarsItem) i := v.(ChatWarsItem)