diff --git a/mud/pkuxkx/etc/ui-settings.extra.tin b/mud/pkuxkx/etc/ui-settings.extra.tin index d4905aa4..61268b92 100644 --- a/mud/pkuxkx/etc/ui-settings.extra.tin +++ b/mud/pkuxkx/etc/ui-settings.extra.tin @@ -7,75 +7,77 @@ #nop {Top} {TopSepBar} {MidSepBar} {Bot} {BotSepBar}; #list prompt-fields create { - { {place}{MidSepBar} {label}{通缉} {name}{wanted} {countdown}{Auto} } - { {place}{MidSepBar} {label}{重启} {name}{reboot} {countdown}{Auto} } - { {place}{MidSepBar} {label}{经验转化率} {name}{pot/exp} } - { {place}{MidSepBar} {label}{周} {name}{week} {visibility}{HideLabel} {countdown}{Auto} } - - { {place}{MidSepBar} {label}{签到} {name}{sign} } - { {place}{MidSepBar} {label}{铜雀台} {name}{tqt} } - - { {place}{MidSepBar} {label}{衣钵传承} {name}{yibo} } - { {place}{MidSepBar} {label}{药炉} {name}{stove} } - - { {place}{MidSepBar} {label}{亲戚} {name}{renqin} } - { {place}{MidSepBar} {label}{燕青拳} {name}{yanqing} } - - { {place}{MidSepBar} {label}{保卫} {name}{baowei} } - { {place}{MidSepBar} {label}{答题} {name}{dati} {countdown}{Auto} } - { {place}{MidSepBar} {label}{比武} {name}{biwu} {countdown}{Auto} } - { {place}{MidSepBar} {label}{福米} {name}{fullme} {cooldown}{600} } - { {place}{MidSepBar} {label}{URL} {name}{URL} {cooldown}{180} } - - { {place}{Bot} {line}{1} {label}{经验} {name}{exp} {width}{8} {visibility}{Always} } - { {place}{Bot} {line}{1} {label}{本次新增} {name}{expDelta} {width}{6} {visibility}{HideLabel} {cooldown}{600} } - { {place}{Bot} {line}{1} {label}{增速} {name}{expSpd} {width}{8} {cooldown}{600} } - { {place}{Bot} {line}{1} {label}{潜能} {name}{pot} {width}{8} {visibility}{Always} } - { {place}{Bot} {line}{1} {label}{本次新增} {name}{potDelta} {width}{6} {visibility}{HideLabel} {cooldown}{600} } - { {place}{Bot} {line}{1} {label}{气血恢复} {name}{yunqi} {width}{5} {cooldown}{60} } - { {place}{Bot} {line}{1} {label}{存款} {name}{saving} {width}{10} {cooldown}{1800} } - { {place}{Bot} {line}{1} {label}{现金} {name}{cash} {width}{10} {cooldown}{600} } - { {place}{Bot} {line}{1} {label}{收益速度} {name}{profit} {width}{10} {cooldown}{600} } - - { {place}{Bot} {line}{1} {label}{奖励最佳} {name}{weekBest} {width}{6} {visibility}{Always} {color}{<129>} } - { {place}{Bot} {line}{1} {label}{加成周} {name}{weekBuff} {width}{6} {visibility}{Always} {color}{<129>} } - - { {place}{Bot} {line}{2} {label}{不利战况} {name}{chousui} {visibility}{Always} {cooldown}{60} } - { {place}{Bot} {line}{2} {label}{透骨钉} {name}{tougu} {visibility}{HideLabel} {cooldown}{60} } - { {place}{Bot} {line}{2} {label}{刺穴} {name}{cixue} {visibility}{HideLabel} {cooldown}{60} } - { {place}{Bot} {line}{2} {label}{刺目} {name}{cimu} {visibility}{HideLabel} {cooldown}{10} {color}{<179><579>} } - { {place}{Bot} {line}{2} {label}{刺腕} {name}{ciwan} {visibility}{HideLabel} {cooldown}{10} {color}{<519>} } - { {place}{Bot} {line}{2} {label}{内力不济} {name}{neili} {visibility}{HideLabel} {cooldown}{10} {color}{<119><519>} } - - { {place}{Bot} {line}{2} {label}{中毒情况} {name}{bingpo1} {visibility}{Always} {cooldown}{60} } - { {place}{Bot} {line}{2} {label}{星宿毒掌} {name}{duzhang1} {visibility}{HideLabel} {cooldown}{60} } - { {place}{Bot} {line}{2} {label}{情毒} {name}{qingdu1} {visibility}{HideLabel} {cooldown}{60} } - { {place}{Bot} {line}{2} {label}{凝血神爪毒} {name}{zhuadu1} {visibility}{HideLabel} {cooldown}{60} } - { {place}{Bot} {line}{2} {label}{生死符} {name}{ssfu1} {visibility}{HideLabel} {cooldown}{60} } - - { {place}{Bot} {line}{2} {label}{有利战况} {name}{ssfu2} {visibility}{Always} {cooldown}{60} } - { {place}{Bot} {line}{2} {label}{日魂激发} {name}{rihun} {visibility}{HideLabel} {cooldown}{60} } - { {place}{Bot} {line}{2} {label}{毒免} {name}{dumian} {visibility}{HideLabel} {cooldown}{60} } - - { {place}{Bot} {line}{3} {label}{状态} {name}{status} {cooldown}{600} } - { {place}{Bot} {line}{3} {label}{持续效果} {name}{persist} {countdown}{Seconds} } - - { {place}{Bot} {line}{10} {label}{系统路径} {name}{walk} } - { {place}{Bot} {line}{11} {label}{本地路径} {name}{path} {cooldown}{600} {visibility}{HideCool} } + { {place}{MidSepBar} {label}{通缉} {name}{wanted} {countdown}{Auto} {visibility}{HideZero} } + { {place}{MidSepBar} {label}{重启} {name}{reboot} {countdown}{Auto} } + { {place}{MidSepBar} {label}{经验转化率} {name}{pot/exp} } + { {place}{MidSepBar} {label}{游戏周} {name}{week} {visibility}{HideLabel} {countdown}{Auto} } + + { {place}{MidSepBar} {label}{签到} {name}{sign} } + { {place}{MidSepBar} {label}{铜雀台} {name}{tqt} } + + { {place}{MidSepBar} {label}{衣钵传承} {name}{yibo} } + { {place}{MidSepBar} {label}{药炉} {name}{stove} } + + { {place}{MidSepBar} {label}{亲戚} {name}{renqin} } + { {place}{MidSepBar} {label}{燕青拳} {name}{yanqing} } + + { {place}{MidSepBar} {label}{保卫} {name}{baowei} } + { {place}{MidSepBar} {label}{答题} {name}{dati} {countdown}{Auto} {visibility}{HideZero} } + { {place}{MidSepBar} {label}{比武} {name}{biwu} {countdown}{Auto} } + { {place}{MidSepBar} {label}{福米} {name}{fullme} {cooldown}{600} } + { {place}{MidSepBar} {label}{URL} {name}{URL} {cooldown}{180} } + + { {place}{Bot} {line}{10} {label}{经验} {name}{exp} {width}{8} {visibility}{Always} } + { {place}{Bot} {line}{10} {label}{本次新增} {name}{expDelta} {width}{6} {visibility}{HideLabel} {cooldown}{600} } + { {place}{Bot} {line}{10} {label}{增速} {name}{expSpd} {width}{8} {cooldown}{600} } + { {place}{Bot} {line}{10} {label}{潜能} {name}{pot} {width}{8} {visibility}{Always} } + { {place}{Bot} {line}{10} {label}{本次新增} {name}{potDelta} {width}{6} {visibility}{HideLabel} {cooldown}{600} } + { {place}{Bot} {line}{10} {label}{气血恢复} {name}{yunqi} {width}{5} {cooldown}{60} } + { {place}{Bot} {line}{10} {label}{存款} {name}{saving} {width}{10} {cooldown}{1800} } + { {place}{Bot} {line}{10} {label}{现金} {name}{cash} {width}{10} {cooldown}{600} } + { {place}{Bot} {line}{10} {label}{收益速度} {name}{profit} {width}{10} {cooldown}{600} } + + { {place}{Bot} {line}{10} {label}{奖励最佳} {name}{weekBest} {visibility}{Always} {color}{<129>} } + { {place}{Bot} {line}{10} {label}{奖励上升} {name}{weekBuff} {visibility}{Always} {color}{<029>} } + { {place}{Bot} {line}{10} {label}{奖励不变} {name}{weekNormal} {visibility}{HideAll} {color}{<079>} } + { {place}{Bot} {line}{10} {label}{奖励下降} {name}{weekDebuff} {visibility}{HideAll} {color}{<119>} } + + { {place}{Bot} {line}{20} {label}{不利战况} {name}{chousui} {visibility}{Always} {cooldown}{60} } + { {place}{Bot} {line}{20} {label}{透骨钉} {name}{tougu} {visibility}{HideLabel} {cooldown}{60} } + { {place}{Bot} {line}{20} {label}{刺穴} {name}{cixue} {visibility}{HideLabel} {cooldown}{60} } + { {place}{Bot} {line}{20} {label}{刺目} {name}{cimu} {visibility}{HideLabel} {cooldown}{10} {color}{<179><579>} } + { {place}{Bot} {line}{20} {label}{刺腕} {name}{ciwan} {visibility}{HideLabel} {cooldown}{10} {color}{<519>} } + { {place}{Bot} {line}{20} {label}{内力不济} {name}{neili} {visibility}{HideLabel} {cooldown}{10} {color}{<119><519>} } + + { {place}{Bot} {line}{20} {label}{中毒情况} {name}{bingpo1} {visibility}{Always} {cooldown}{60} } + { {place}{Bot} {line}{20} {label}{星宿毒掌} {name}{duzhang1} {visibility}{HideLabel} {cooldown}{60} } + { {place}{Bot} {line}{20} {label}{情毒} {name}{qingdu1} {visibility}{HideLabel} {cooldown}{60} } + { {place}{Bot} {line}{20} {label}{凝血神爪毒} {name}{zhuadu1} {visibility}{HideLabel} {cooldown}{60} } + { {place}{Bot} {line}{20} {label}{生死符} {name}{ssfu1} {visibility}{HideLabel} {cooldown}{60} } + + { {place}{Bot} {line}{20} {label}{有利战况} {name}{ssfu2} {visibility}{Always} {cooldown}{60} } + { {place}{Bot} {line}{20} {label}{日魂激发} {name}{rihun} {visibility}{HideLabel} {cooldown}{60} } + { {place}{Bot} {line}{20} {label}{毒免} {name}{dumian} {visibility}{HideLabel} {cooldown}{60} } + + { {place}{Bot} {line}{30} {label}{状态} {name}{status} {cooldown}{600} } + { {place}{Bot} {line}{30} {label}{持续效果} {name}{persist} {countdown}{Seconds} } + + { {place}{Bot} {line}{40} {label}{系统路径} {name}{walk} } + { {place}{Bot} {line}{45} {label}{本地路径} {name}{path} {cooldown}{600} {visibility}{HideCool} } { {place}{Bot} {line}{99} {label}{<119>警报} {name}{alert} } - { {place}{Bot} {line}{99} {label}{随手记} {name}{note} {color}{<134>}} + { {place}{Bot} {line}{99} {label}{随手记} {name}{note} {color}{<134>}} { {place}{BotSepBar} {label}{小键盘走路} {name}{keypad} } { {place}{BotSepBar} {label}{触摸屏走路} {name}{screenKeypad} } { {place}{BotSepBar} {label}{运镖模式} {name}{ganche} } { {place}{BotSepBar} {label}{搜索条件} {name}{search} } - { {place}{BotSepBar} {label}{屏幕美化} {name}{beautify} {cooldown}{600} {visibility}{HideCool} } - { {place}{BotSepBar} {label}{状态栏更新} {name}{disable} {visibility}{HideLabel} } + { {place}{BotSepBar} {label}{屏幕美化} {name}{beautify} {cooldown}{600} {visibility}{HideCool} } + { {place}{BotSepBar} {label}{状态栏更新} {name}{disable} {visibility}{HideLabel} } { {place}{BotSepBar} {label}{任务} {name}{job} } - { {place}{BotSepBar} {label}{阶段} {name}{stage} {cooldown}{1200} {countdown}{Auto} } - { {place}{BotSepBar} {label}{区域} {name}{area} {cooldown}{1200} } - { {place}{BotSepBar} {label}{地点} {name}{room} {cooldown}{1200} } + { {place}{BotSepBar} {label}{阶段} {name}{stage} {cooldown}{1200} {countdown}{Auto} } + { {place}{BotSepBar} {label}{区域} {name}{area} {cooldown}{1200} } + { {place}{BotSepBar} {label}{地点} {name}{room} {cooldown}{1200} } { {place}{BotSepBar} {label}{目标} {name}{target} } { {place}{BotSepBar} {label}{类型} {name}{type} } }; diff --git a/mud/pkuxkx/plugins/basic/cmds/jobquery.tin b/mud/pkuxkx/plugins/basic/cmds/jobquery.tin index 7b7e7c44..bc814ceb 100644 --- a/mud/pkuxkx/plugins/basic/cmds/jobquery.tin +++ b/mud/pkuxkx/plugins/basic/cmds/jobquery.tin @@ -270,8 +270,11 @@ VAR {任务CD状态查询结果} gJobState {}; okLog 任务 CD 状态已更新,以下任务正在进行中:$doingStr,以下任务仍然处于 CD 中:$cdStr; }; + event.Emit env/week/update; prompt.Set {{weekBest}{$env.Week[best]}}; prompt.Set {{weekBuff}{$env.Week[buff]}}; + prompt.Set {{weekNormal}{$env.Week[normal]}}; + prompt.Set {{weekDebuff}{$env.Week[debuff]}}; event.Emit {jobquery}; }; diff --git a/mud/pkuxkx/plugins/basic/env.tin b/mud/pkuxkx/plugins/basic/env.tin index 9d8fb483..05e08433 100644 --- a/mud/pkuxkx/plugins/basic/env.tin +++ b/mud/pkuxkx/plugins/basic/env.tin @@ -22,7 +22,8 @@ VAR {服务器重启时间} {env.RebootTime} {0}; event.Define {env/set} {无参} {$MODULE} {环境变量发生改变(set/unset)时发送本事件,本事件只会唤醒与变量名相匹配的钩子}; event.Define {env/update} {无参} {$MODULE} {环境变量列表已更新}; -event.Define {env/time/update} {无参} {$MODULE} {当前游戏周的内容已更新}; +event.Define {env/time/update} {无参} {$MODULE} {time 命令的内容已更新}; +event.Define {env/week/update} {无参} {$MODULE} {当前游戏周的内容已更新}; #alias {env.parse} { #class env.parse open; @@ -234,10 +235,13 @@ event.Define {env/time/update} {无参} {$MODULE} {当前游戏周的内容已 }; event.HandleOnce GA {basic/env} {basic/env} { - event.Emit env/time/update; okLog 当前游戏周已更新。; + event.Emit env/week/update; + event.Emit env/time/update; prompt.Set {{weekBest}{$env.Week[best]}}; prompt.Set {{weekBuff}{$env.Week[buff]}}; + prompt.Set {{weekNormal}{$env.Week[normal]}}; + prompt.Set {{weekDebuff}{$env.Week[debuff]}}; #class env.Time.parse kill; #0 };