Merge pull request #297 from AmiyaBot/V6-dev

V6 dev
AmiyaBot · Nov 25, 2024 · b0e81ef · b0e81ef
2 parents b03024d + 34d8012
commit b0e81ef
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 3 deletions.
diff --git a/.github/publish.txt b/.github/publish.txt
@@ -1 +1 @@
-v6.5.4
+v6.5.5
diff --git a/core/database/bot.py b/core/database/bot.py
@@ -168,11 +168,76 @@ class OperatorConfig(BotBaseModel):
 @table
 class Pool(BotBaseModel):
     pool_name: Union[CharField, str] = CharField(unique=True)
+
+    pool_uuid: Union[CharField, str] = CharField(null=True, default='')
+    '''
+    用于区分同名非官方卡池，因为非官方卡池是可能会有同名的情况的
+    而数字Id不适用于远端数据库
+    '''
+
+    pool_description: Union[CharField, str] = CharField(null=True, default='')
+    '''
+    卡池描述，为空或None时会根据卡池内容自动生成一个。
+    '''
+
+    pool_image: Union[CharField, str] = CharField(null=True, default='')
+    '''
+    卡池的题图
+    '''
+
+    limit_pool: int = IntegerField()
+    '''
+    卡池类型
+    0: 常规寻访
+    1: 限定寻访
+    2: 联合寻访
+    3: 前路回响
+    4: 中坚寻访
+    5: 其他寻访
+    '''
+
+    is_classicOnly: bool = BooleanField(default=False)
+    '''
+    填充干员是否只包含中坚干员
+    '''
+    is_official: bool = BooleanField(default=True)
+    '''
+    是否为官方卡池
+    '''
+
+    # 卡池Up干员，和Up干员的加总概率，设置为100即为联合寻访（只有Up干员）
+    # 如果各个Up干员的rate不一样，可以在干员名后面用竖线分隔权重，权重可以为负数
+    # 例如：'干员1|1,干员2|5,干员3|5'
+    # 所有Up干员加权平分rate给出的概率。剩下的由常规干员填充
+    # 概率为小数，大于1的概率值会被转换为1
+    # 概率为None视为0
+    # pickup_s 为 五倍权重提升的任意干员，或者1倍权重但是会在本池抽出的限定干员，注意：其他fillin干员，权重为1
+
     pickup_6: Union[CharField, str] = CharField(null=True, default='')
+    pickup_6_rate: float = FloatField(null=True, default=None)
+    pickup_s: Union[CharField, str] = CharField(null=True, default='')
+
     pickup_5: Union[CharField, str] = CharField(null=True, default='')
+    pickup_5_rate: float = FloatField(null=True, default=None)
+    pickup_s_5: Union[CharField, str] = CharField(null=True, default='')
+
     pickup_4: Union[CharField, str] = CharField(null=True, default='')
-    pickup_s: Union[CharField, str] = CharField(null=True, default='')
-    limit_pool: int = IntegerField()
+    pickup_4_rate: float = FloatField(null=True, default=None)
+    pickup_s_4: Union[CharField, str] = CharField(null=True, default='')
+
+    pickup_3: Union[CharField, str] = CharField(null=True, default='')
+    pickup_3_rate: float = FloatField(null=True, default=None)
+    pickup_s_3: Union[CharField, str] = CharField(null=True, default='')
+
+    pickup_2: Union[CharField, str] = CharField(null=True, default='')
+    pickup_2_rate: float = FloatField(null=True, default=0)
+    pickup_s_2: Union[CharField, str] = CharField(null=True, default='')
+
+    pickup_1: Union[CharField, str] = CharField(null=True, default='')
+    pickup_1_rate: float = FloatField(null=True, default=0)
+    pickup_s_1: Union[CharField, str] = CharField(null=True, default='')
+
+    version: Union[CharField, str] = CharField(null=True, default='')
 
 
 @table

diff --git a/core/database/user.py b/core/database/user.py
@@ -113,7 +113,10 @@ class UserGachaInfo(UserBaseModel):
     user_id: Union[ForeignKeyField, str] = ForeignKeyField(User, db_column='user_id', on_delete='CASCADE')
     coupon: int = IntegerField(default=50)
     gacha_break_even: int = IntegerField(default=0)
+    use_custom_gacha_pool: bool = BooleanField(default=False)
     gacha_pool: int = IntegerField(default=1)
+    custom_gacha_pool: str = CharField(default='')
+
 
 
 @table