bump version

313dbf8e · yuudi · cc1139cf · 313dbf8e · 313dbf8e · 313dbf8e
Commit 313dbf8e authored May 19, 2020 by yuudi
--- a/docs/v3/ver.json
+++ b/docs/v3/ver.json
 {
    "stable": {
-        "version": 3444,
-        "url": "http://img.yobot.xyz/yobot/yobot3444.zip"
+        "version": 3457,
+        "url": "http://img.yobot.xyz/yobot/yobot3457.zip"
    }
 }
\ No newline at end of file
--- a/documents/install/Windows-portable.md
+++ b/documents/install/Windows-portable.md
@@ -41,7 +41,7 @@ yobot 三代基于酷Q机器人和 httpapi 插件实现

 ### Windows系统

-[点击下载便携版](http://tools.yobot.win/fetch-latest/)
+[点击下载便携版](https://yobot.lanzous.com/b00nlr3ni)

 下载yobot便携版，创建一个文件夹解压，启动 yobot.exe 即可。如需更改端口，请启动一次后修改 yobot_config.json 中的 port 字段并重启。


--- a/documents/install/Windows-quick-start.md
+++ b/documents/install/Windows-quick-start.md
@@ -28,7 +28,7 @@

 ### 第二步

-点击下载[yobot便携版](http://tools.yobot.win/fetch-latest/)
+点击下载[yobot便携版](https://yobot.lanzous.com/b00nlr3ni)

 解压后双击“yobot.exe”启动服务，双方通信成功后出现如下的提示


--- a/src/client/public/static/clan/statistics/statistics2.js
+++ b/src/client/public/static/clan/statistics/statistics2.js
@@ -607,7 +607,7 @@ var vm = new Vue({
                    if (clist[i].health_ramain != 0) {
                        damage = clist[i].damage;
                    } 
-                    else if (clist[i+1].is_continue) {
+                    else if (clist[i+1]?.is_continue) {
                        damage = clist[i].damage + clist[i+1].damage
                        i++;
                    }

--- a/src/client/public/template/clan/statistics.html
+++ b/src/client/public/template/clan/statistics.html
@@ -6,15 +6,10 @@

 <body>
    <p><a href="../">返回</a></p>
-    <h1>建设中</h1>
+    <h1>数据分析</h1>
    <p><a href="./1/">统计：出刀顺序表</a> by <a href="https://github.com/Ai-Himmel">@Ai-Himmel</a></p>
    <p><a href="./2/">统计：数据图表</a> by <a href="https://github.com/Diving-Fish">@Diving-Fish</a> & <a href="https://github.com/winrey">@Winrey</a></p>
    <p><a href="#" target="_blank" id="pcrd-yobot-fe">统计：多维度分析</a>（需要开启api访问） by <a href="https://github.com/Tan90Qian">@Tan90Qian</a></p>
-    <!--
-        不知道统计改怎么写，所以我就没写了
-        但还是有大佬写出来了有用的分析，感谢这些大佬的贡献
-        更多统计等待大佬们出主意，欢迎PR，可以内置到yobot里，也可以外部调用api进行分析
-    -->
    <p>
        原始数据（json格式）<br>
        <a href="./api/">查看本轮</a> <a href="./api/" download>下载本轮</a><br>

--- a/src/client/public/template/user.html
+++ b/src/client/public/template/user.html
@@ -52,7 +52,7 @@
        </el-row>
    </div>
    <p><a href="{{ url_for('yobot_about') }}">关于yobot</a></p>
-    <footer style="text-align: center">
+    <footer style="position: absolute;bottom: 0;left: 50%;transform: translate(-50%, -50%);">
        powered by <a href="https://github.com/yuudi/yobot">yobot</a>
    </footer>
 </body>

--- a/src/client/ybplugins/calender.py
+++ b/src/client/ybplugins/calender.py
+import asyncio
 import datetime
 import json
 import re
@@ -50,6 +51,9 @@ class Event:

        self.timeline = None

+        loop = asyncio.get_event_loop()
+        asyncio.ensure_future(self.load_timeline_async(), loop=loop)
+
    def load_timeline(self, rg):
        raise RuntimeError("no more sync calling")

@@ -300,9 +304,4 @@ class Event:
        hour, minute = time.split(":")
        trigger = CronTrigger(hour=hour, minute=minute)
        job = (trigger, self.send_daily_async)
-        init_trigger = DateTrigger(
-            datetime.datetime.now() +
-            datetime.timedelta(seconds=5)
-        )  # 启动5秒后初始化
-        init_job = (init_trigger, self.load_timeline_async)
-        return (job, init_job)
+        return (job,)
--- a/src/client/ybplugins/custom.py
+++ b/src/client/ybplugins/custom.py
@@ -40,7 +40,7 @@ class Custom:
        '''
        # 注意：这个类加载时，asyncio事件循环尚未启动，且bot_api没有连接
        # 此时不要调用bot_api
-        # 此时没有running_loop，不要直接使用await或asyncio.creat_task
+        # 此时没有running_loop，不要直接使用await，请使用asyncio.ensure_future并指定loop=asyncio.get_event_loop()

        # 如果需要启用，请注释掉下面一行
        return

--- a/src/client/yobot.py
+++ b/src/client/yobot.py
@@ -33,8 +33,8 @@ else:


 class Yobot:
-    Version = "[v3.6.1_beta_2]"
-    Version_id = 156
+    Version = "[v3.6.1_rc1]"
+    Version_id = 157
    #  "git rev-list --count HEAD"

    def __init__(self, *,