Merge branch 'main' of https://github.com/HydroRoll-Team/HydroRoll

HydroRoll-Team · Nov 2, 2023 · f6c16fe · f6c16fe
2 parents 5a20338 + 58d7bc6
commit f6c16fe
Show file tree

Hide file tree

Showing 3 changed files with 96 additions and 6 deletions.
diff --git a/docs/assets/未命名绘图.drawio b/docs/assets/未命名绘图.drawio
@@ -0,0 +1,83 @@
+<mxfile host="app.diagrams.net" modified="2023-09-29T15:24:48.616Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36 Edg/117.0.2045.41" etag="n8KncuzfugVioFd6lPyc" version="21.8.2" type="github">
+ <diagram name="第 1 页" id="fM8ZoEg2tMh_4A5Gsyvf">
+ <mxGraphModel dx="1309" dy="1988" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+ <root>
+ <mxCell id="0" />
+ <mxCell id="1" parent="0" />
+ <mxCell id="SVVQ4AVB_GTqvJ0-vTll-1" value="iamai" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="357" y="60" width="113" height="60" as="geometry" />
+ </mxCell>
+ <mxCell id="SVVQ4AVB_GTqvJ0-vTll-2" value="HydroRoll&lt;br&gt;" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="354" y="210" width="120" height="60" as="geometry" />
+ </mxCell>
+ <mxCell id="SVVQ4AVB_GTqvJ0-vTll-4" value="Psi" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="190" y="460" width="120" height="60" as="geometry" />
+ </mxCell>
+ <mxCell id="SVVQ4AVB_GTqvJ0-vTll-5" value="HydroRollCore" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="520" y="460" width="120" height="60" as="geometry" />
+ </mxCell>
+ <mxCell id="SVVQ4AVB_GTqvJ0-vTll-16" value="Tokens" style="html=1;verticalAlign=bottom;endArrow=open;dashed=1;endSize=8;curved=0;rounded=0;entryX=0.25;entryY=1;entryDx=0;entryDy=0;exitX=0.25;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="SVVQ4AVB_GTqvJ0-vTll-4" target="SVVQ4AVB_GTqvJ0-vTll-2">
+ <mxGeometry relative="1" as="geometry">
+ <mxPoint x="414" y="389.5" as="sourcePoint" />
+ <mxPoint x="334" y="389.5" as="targetPoint" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="SVVQ4AVB_GTqvJ0-vTll-17" value="Events" style="html=1;verticalAlign=bottom;endArrow=block;curved=0;rounded=0;entryX=0.75;entryY=0;entryDx=0;entryDy=0;exitX=0.75;exitY=1;exitDx=0;exitDy=0;fillColor=#f8cecc;strokeColor=#b85450;" edge="1" parent="1" source="SVVQ4AVB_GTqvJ0-vTll-2" target="SVVQ4AVB_GTqvJ0-vTll-4">
+ <mxGeometry width="80" relative="1" as="geometry">
+ <mxPoint x="370" y="300" as="sourcePoint" />
+ <mxPoint x="450" y="300" as="targetPoint" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="SVVQ4AVB_GTqvJ0-vTll-18" value="Tokens" style="html=1;verticalAlign=bottom;startArrow=oval;startFill=1;endArrow=block;startSize=8;curved=0;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fillColor=#f8cecc;strokeColor=#b85450;" edge="1" parent="1" source="SVVQ4AVB_GTqvJ0-vTll-4" target="SVVQ4AVB_GTqvJ0-vTll-5">
+ <mxGeometry width="60" relative="1" as="geometry">
+ <mxPoint x="380" y="300" as="sourcePoint" />
+ <mxPoint x="440" y="300" as="targetPoint" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="SVVQ4AVB_GTqvJ0-vTll-19" value="Signal" style="html=1;verticalAlign=bottom;endArrow=open;dashed=1;endSize=8;curved=0;rounded=0;exitX=0.25;exitY=0;exitDx=0;exitDy=0;entryX=1;entryY=0.75;entryDx=0;entryDy=0;fillColor=#f8cecc;strokeColor=#b85450;" edge="1" parent="1" source="SVVQ4AVB_GTqvJ0-vTll-5" target="SVVQ4AVB_GTqvJ0-vTll-2">
+ <mxGeometry relative="1" as="geometry">
+ <mxPoint x="670" y="370" as="sourcePoint" />
+ <mxPoint x="590" y="390" as="targetPoint" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="SVVQ4AVB_GTqvJ0-vTll-21" value="Events" style="html=1;verticalAlign=bottom;endArrow=block;curved=0;rounded=0;entryX=0.75;entryY=0;entryDx=0;entryDy=0;exitX=0.75;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" source="SVVQ4AVB_GTqvJ0-vTll-1" target="SVVQ4AVB_GTqvJ0-vTll-2">
+ <mxGeometry width="80" relative="1" as="geometry">
+ <mxPoint x="370" y="300" as="sourcePoint" />
+ <mxPoint x="450" y="300" as="targetPoint" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="SVVQ4AVB_GTqvJ0-vTll-22" value="Signal" style="html=1;verticalAlign=bottom;endArrow=open;dashed=1;endSize=8;curved=0;rounded=0;exitX=0.25;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="SVVQ4AVB_GTqvJ0-vTll-2">
+ <mxGeometry relative="1" as="geometry">
+ <mxPoint x="240" y="160" as="sourcePoint" />
+ <mxPoint x="380" y="120" as="targetPoint" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="SVVQ4AVB_GTqvJ0-vTll-26" value="Events" style="html=1;verticalAlign=bottom;endArrow=block;curved=0;rounded=0;entryX=0.865;entryY=-0.048;entryDx=0;entryDy=0;exitX=0.704;exitY=1.07;exitDx=0;exitDy=0;exitPerimeter=0;entryPerimeter=0;" edge="1" parent="1" source="SVVQ4AVB_GTqvJ0-vTll-38" target="SVVQ4AVB_GTqvJ0-vTll-1">
+ <mxGeometry width="80" relative="1" as="geometry">
+ <mxPoint x="481" y="-70" as="sourcePoint" />
+ <mxPoint x="290" y="174.5" as="targetPoint" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="SVVQ4AVB_GTqvJ0-vTll-30" value="Signal" style="html=1;verticalAlign=bottom;endArrow=open;dashed=1;endSize=8;curved=0;rounded=0;exitX=0.25;exitY=0;exitDx=0;exitDy=0;entryX=0.29;entryY=1.026;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="1" source="SVVQ4AVB_GTqvJ0-vTll-1" target="SVVQ4AVB_GTqvJ0-vTll-38">
+ <mxGeometry relative="1" as="geometry">
+ <mxPoint x="450" y="120" as="sourcePoint" />
+ <mxPoint x="360" y="-70" as="targetPoint" />
+ <Array as="points" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="SVVQ4AVB_GTqvJ0-vTll-35" value="Adapters" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="334" y="-170" width="160" height="86" as="geometry" />
+ </mxCell>
+ <mxCell id="SVVQ4AVB_GTqvJ0-vTll-36" value="Mirai" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" vertex="1" parent="SVVQ4AVB_GTqvJ0-vTll-35">
+ <mxGeometry y="26" width="160" height="26" as="geometry" />
+ </mxCell>
+ <mxCell id="SVVQ4AVB_GTqvJ0-vTll-37" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;" vertex="1" parent="SVVQ4AVB_GTqvJ0-vTll-35">
+ <mxGeometry y="52" width="160" height="8" as="geometry" />
+ </mxCell>
+ <mxCell id="SVVQ4AVB_GTqvJ0-vTll-38" value="go-cqhttp" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" vertex="1" parent="SVVQ4AVB_GTqvJ0-vTll-35">
+ <mxGeometry y="60" width="160" height="26" as="geometry" />
+ </mxCell>
+ </root>
+ </mxGraphModel>
+ </diagram>
+</mxfile>
diff --git a/examples/with-react-native-web/yarn.lock b/examples/with-react-native-web/yarn.lock
@@ -2044,9 +2044,9 @@
  "@hapi/hoek" "^9.0.0"
 
 "@sideway/formula@^3.0.0":
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.0.tgz#fe158aee32e6bd5de85044be615bc08478a0a13c"
- integrity sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg==
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.1.tgz#80fcbcbaf7ce031e0ef2dd29b1bfc7c3f583611f"
+ integrity sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==
 
 "@sideway/pinpoint@^2.0.0":
  version "2.0.0"
@@ -3148,9 +3148,9 @@ decamelize@^1.2.0:
  integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
 
 decode-uri-component@^0.2.0:
- version "0.2.0"
- resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
- integrity sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==
+ version "0.2.2"
+ resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
+ integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
 
 deep-extend@^0.6.0:
  version "0.6.0"

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,5 +1,6 @@
 [project]
 name = "HydroRoll"
+<<<<<<< HEAD
 version = "0.1.0"
 description = "HydroRoll System."
 authors = [
@@ -16,6 +17,12 @@ dependencies = [
  "scikit-learn>=1.3.1",
 ]
 requires-python = ">=3.8"
+=======
+version = "1.0.3"
+description = "bot framework."
+authors = ["简律纯 <i@jyunko.cn>"]
+license = "GPL3.0"
+>>>>>>> 58d7bc6a2057ab5daac2aa590fc873c85b388bbb
 readme = "README.md"
 license = {text = "MIT"}
 keywords = ["bot", "qq", "qqbot", "mirai", "coolq"]