版本推进至3.3.6

+ 修正set指令在极其罕见情况下可能会导致r指令出现的问题
OlivOS-Team · Nov 15, 2022 · 817bc5a · 817bc5a
1 parent e8c7a62
commit 817bc5a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/OlivaDiceCore/app.json b/OlivaDiceCore/app.json
@@ -4,8 +4,8 @@
     "namespace" : "OlivaDiceCore",
     "message_mode" : "old_string",
     "info" : "本模块为OlivaDice的核心模块，提供了所有必须的骰子功能以及基础的管理支持，几乎所有的其它模块都依赖这个模块。",
-    "version" : "3.3.5",
-    "svn" : 1055,
+    "version" : "3.3.6",
+    "svn" : 1056,
     "compatible_svn" : 101,
     "priority" : 20000,
     "support" : [

diff --git a/OlivaDiceCore/data.py b/OlivaDiceCore/data.py
@@ -22,8 +22,8 @@
 import OlivOS
 
 OlivaDiceCore_name = 'OlivaDice核心模块'
-OlivaDiceCore_ver = '3.3.5'
-OlivaDiceCore_svn = 1055
+OlivaDiceCore_ver = '3.3.6'
+OlivaDiceCore_svn = 1056
 OlivaDiceCore_ver_short = '%s(%s)' % (str(OlivaDiceCore_ver), str(OlivaDiceCore_svn))
 
 exce_path = os.getcwd()

diff --git a/OlivaDiceCore/drawCard.py b/OlivaDiceCore/drawCard.py
@@ -302,7 +302,7 @@ def initDeck(bot_info_dict):
                 ('Init', 'default')
             ]
         )
-        
+
 def initExcelDeckData(data):
     res = {}
     for obj_Deck_this_name in data.sheetnames:

diff --git a/OlivaDiceCore/msgReply.py b/OlivaDiceCore/msgReply.py
@@ -4088,10 +4088,10 @@ def unity_reply(plugin_event, Proc):
                 rd_para_str = rd_para_main_str
             tmp_template_customDefault = copy.deepcopy(tmp_template_customDefault)
             if type(rd_para_main_D_right) == int:
-                if type(tmp_template_customDefault) != dict or 'd' not in tmp_template_customDefault:
-                    tmp_template_customDefault = {
-                        'd': {}
-                    }
+                if type(tmp_template_customDefault) != dict:
+                    tmp_template_customDefault = {}
+                    if 'd' not in tmp_template_customDefault:
+                        tmp_template_customDefault['d'] = {}
                 tmp_template_customDefault['d']['rightD'] = rd_para_main_D_right
             if roll_times_count == 1:
                 rd_para = OlivaDiceCore.onedice.RD(rd_para_str, tmp_template_customDefault, valueTable = skill_valueTable)