Merge pull request #4 from OlivOS-Team/dev

开发分支合并入主干
OlivOS-Team · Jun 13, 2022 · f8220b2 · f8220b2
2 parents 79f45ea + 36b6524
commit f8220b2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/OlivaDiceJoy/data.py b/OlivaDiceJoy/data.py
@@ -15,6 +15,6 @@
 '''
 
 
-OlivaDiceJoy_ver = '3.0.3'
-OlivaDiceJoy_svn = 11
+OlivaDiceJoy_ver = '3.0.4'
+OlivaDiceJoy_svn = 12
 OlivaDiceJoy_ver_short = '%s(%s)' % (str(OlivaDiceJoy_ver), str(OlivaDiceJoy_svn))
diff --git a/OlivaDiceJoy/msgCustom.py b/OlivaDiceJoy/msgCustom.py
@@ -57,6 +57,8 @@
 注: 本模块为可选不重要模块。''',
 
     'OlivaDiceJoy更新': '''[OlivaDiceJoy]
+3.0.4: 戳一戳今日人品
+3.0.3: 戳一戳掷骰
 3.0.2: 用户记录优化
 3.0.0: 初始化项目''',
 

diff --git a/OlivaDiceJoy/msgReply.py b/OlivaDiceJoy/msgReply.py
@@ -85,7 +85,16 @@ def poke_jrrp(plugin_event, type):
         tmp_reply_str = dictStrCustom['strJoyJrrp'].format(**dictTValue)
     return tmp_reply_str
 
-def poke_rd(plugin_event, type):
+def poke_rd(plugin_event, event_type):
+    tmp_group_id = plugin_event.data.group_id
+    tmp_hagID = None
+    if event_type == 'group':
+        if tmp_group_id == -1:
+            tmp_hagID = None
+        elif tmp_group_id == None:
+            tmp_hagID = None
+        elif type(tmp_group_id) == str:
+            tmp_hagID = tmp_group_id
     dictTValue = OlivaDiceCore.msgCustom.dictTValue.copy()
     dictTValue['tName'] = '你'
     tmp_pcName = None
@@ -100,8 +109,8 @@ def poke_rd(plugin_event, type):
         tmp_pc_id,
         tmp_pc_platform
     )
-    skill_valueTable = OlivaDiceCore.pcCard.pcCardDataGetByPcName(tmp_pcHash)
-    tmp_pcName = OlivaDiceCore.pcCard.pcCardDataGetSelectionKey(tmp_pcHash)
+    skill_valueTable = OlivaDiceCore.pcCard.pcCardDataGetByPcName(tmp_pcHash, hagId = tmp_hagID)
+    tmp_pcName = OlivaDiceCore.pcCard.pcCardDataGetSelectionKey(tmp_pcHash, hagId = tmp_hagID)
     if tmp_pcName != None:
         tmp_template_name = OlivaDiceCore.pcCard.pcCardDataGetTemplateKey(tmp_pcHash, tmp_pcName)
         tmp_template = OlivaDiceCore.pcCard.pcCardDataGetTemplateByKey(tmp_template_name)