2nd merge for new sprites

JeongJun-Lee · Mar 3, 2024 · bf4092e · bf4092e
1 parent 074fbd6
commit bf4092e
Show file tree

Hide file tree

Showing 3 changed files with 5,481 additions and 2,920 deletions.
diff --git a/src/renderer/resources/db/ExcelToJson_sprites.py b/src/renderer/resources/db/ExcelToJson_sprites.py
@@ -14,12 +14,16 @@
             printable.append(temp)
             # print(printable)
             temp = {}
-        temp['_id'] = str(item['filename'])
+        temp['_id'] = str(idx + 1)
         temp['name'] = item['ko']
         temp['created'] = ''
         temp['specials'] = []
         temp['sounds'] = []
-        temp['category'] = {'main': item['main'], 'sub': item['sub']}
+        temp['category'] = {
+            'main': item['main'], 
+        }
+        if item['sub']:
+            temp['category']['sub'] = item['sub']
         temp['label'] = {'ko': item['ko'], 'en': item['en'], 'uz': item['uz'], 'ru': item['ru']}
     else:  
         if not 'pictures' in temp:
@@ -28,6 +32,8 @@
         picture['name'] = item['ko']
         picture['filename'] = item['filename']
         picture['imageType'] = item['imageType']
+        # if picture['imageType'] == 'svg':
+        #     temp['hasSvg'] = True
         picture['dimension'] = {'width': item['main'], 'height': item['sub']}
         picture['label'] = {'ko': item['ko'], 'en': item['en'], 'uz': item['uz'], 'ru': item['ru']}
         temp['pictures'].append(picture)