jianghe2nd/mota-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #353 from dljgs1/v2.0

Browse Source 
跟随者的对话框
This commit is contained in:
Zhang Chen 2019-04-17 22:56:13 +08:00 committed by GitHub
commit 8125965525
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/ui.js
View File

@ -403,9 +403,9 @@ ui.prototype._getPosition = function (content) {
py = core.status.event.data.y; py = core.status.event.data.y;
} }
content = content.replace("\b", "\\b") content = content.replace("\b", "\\b")
.replace(/\\b\[(up|center|down|hero|null)(,(hero|null|\d+,\d+))?]/g, function (s0, s1, s2, s3) { .replace(/\\b\[(up|center|down|hero|null)(,(hero|null|\d+,\d+|\d+))?]/g, function (s0, s1, s2, s3) {
pos = s1; pos = s1;
if (s3 == 'hero' || s1=='hero') { if (s3 == 'hero' || s1=='hero' && !s3) {
px = core.status.hero.loc.x; px = core.status.hero.loc.x;
py = core.status.hero.loc.y; py = core.status.hero.loc.y;
} }
@ -414,9 +414,15 @@ ui.prototype._getPosition = function (content) {
} }
else if (s3) { else if (s3) {
var str = s3.split(','); var str = s3.split(',');
if(str.length==1){
var follower = (core.status.hero.followers||{})[parseInt(str[0])-1]||{};
px = follower.x || null;
py = follower.y || null;
}else{
px = parseInt(str[0]); px = parseInt(str[0]);
py = parseInt(str[1]); py = parseInt(str[1]);
} }
}
if(pos=='hero' || pos=='null'){ if(pos=='hero' || pos=='null'){
pos = py==null?'center':(py>=core.__HALF_SIZE__? 'up':'down'); pos = py==null?'center':(py>=core.__HALF_SIZE__? 'up':'down');
} }