new duellinks characters

Assets/Addressables/Text/UpdateContent.txt

 MDPro3 v1.3.9更新：
-1.在[游戏设置-关于游戏-关于更新]中添加了新的网盘下载地址。
-2.修复决斗中部分选择卡片时可以不选择卡片的场合，无法不选择卡片的错误；
-3.修复决斗消息某些情况下显示了错误玩家名的错误；
-4.修复在进入决斗的过渡画面中点击左上角能够退出决斗的错误；
+1.新动态卡图：超魔导龙骑士-真红眼龙骑士[37818794]、
+	黑魔术少女[38033128]、黑魔术师[46986427]、
+	真红眼黑龙[74677430]、青眼白龙[89631149]；
+2.新决斗链接语音角色：人偶[0028]、城之内克也[0043]（异画）、基古拉[0441]、阿里特[0442]；
+3.在[游戏设置-关于游戏-关于更新]中添加了新的网盘下载地址；
+4.修复决斗中部分选择卡片时可以不选择卡片的场合，无法不选择卡片的错误；
+5.修复决斗消息某些情况下显示了错误玩家名的错误；
+6.修复在进入决斗的过渡画面中点击左上角能够退出决斗的错误；
 
 MDPro3 v1.3.8更新：
 1.非中文的卡片渲染的属性球添加了注音文字；

Assets/Prefabs/ScriptableObjects/Characters.asset

@@ -15,608 +15,939 @@ MonoBehaviour:
   dm:
   - id: 0001
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0002
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0003
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0004
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0005
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0006
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0007
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0008
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0009
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0010
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0011
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0012
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0013
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0014
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0015
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0016
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0017
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0018
     originalId: 
+    descriptionId: 
     notReady: 1
   - id: 0019
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0020
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0021
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0022
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0023
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0024
     originalId: 
+    descriptionId: 
     notReady: 0
-  - id: 0025
+  - id: 0026
     originalId: 
+    descriptionId: 
     notReady: 1
+  - id: 0028
+    originalId: 
+    descriptionId: 
+    notReady: 0
   - id: 0029
     originalId: 
+    descriptionId: 
     notReady: 0
+  - id: 0030
+    originalId: 
+    descriptionId: 
+    notReady: 1
   - id: 0031
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0032
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0033
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0034
     originalId: 
+    descriptionId: 
     notReady: 0
+  - id: 0035
+    originalId: 
+    descriptionId: 
+    notReady: 1
+  - id: 0036
+    originalId: 
+    descriptionId: 
+    notReady: 1
+  - id: 0037
+    originalId: 
+    descriptionId: 
+    notReady: 1
   - id: 0040
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0041
     originalId: 0001
+    descriptionId: 
     notReady: 0
   - id: 0042
     originalId: 0002
+    descriptionId: 
+    notReady: 0
+  - id: 0043
+    originalId: 0003
+    descriptionId: 
     notReady: 0
   - id: 0045
     originalId: 0005
+    descriptionId: 
     notReady: 0
   - id: 0046
-    originalId: 0017
+    originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0047
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0048
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0053
     originalId: 
+    descriptionId: 
     notReady: 0
   gx:
   - id: 0101
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0102
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0103
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0104
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0105
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0106
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0107
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0109
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0110
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0112
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0113
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0114
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0115
     originalId: 
+    descriptionId: 
     notReady: 0
+  - id: 0116
+    originalId: 
+    descriptionId: 
+    notReady: 1
+  - id: 0117
+    originalId: 
+    descriptionId: 
+    notReady: 1
+  - id: 0131
+    originalId: 
+    descriptionId: 
+    notReady: 1
+  - id: 0132
+    originalId: 
+    descriptionId: 
+    notReady: 1
+  - id: 0133
+    originalId: 
+    descriptionId: 
+    notReady: 1
+  - id: 0134
+    originalId: 
+    descriptionId: 
+    notReady: 1
+  - id: 0135
+    originalId: 
+    descriptionId: 
+    notReady: 1
   - id: 0140
     originalId: 
+    descriptionId: 
     notReady: 0
+  - id: 0148
+    originalId: 
+    descriptionId: 
+    notReady: 1
   - id: 0153
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0154
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0155
     originalId: 
+    descriptionId: 
     notReady: 0
   _5ds:
   - id: 0201
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0202
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0203
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0204
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0205
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0206
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0207
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0208
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0209
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0210
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0211
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0213
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0214
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0215
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0216
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0217
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0218
     originalId: 
+    descriptionId: 
     notReady: 0
+  - id: 0231
+    originalId: 
+    descriptionId: 
+    notReady: 1
+  - id: 0235
+    originalId: 
+    descriptionId: 
+    notReady: 1
+  - id: 0236
+    originalId: 
+    descriptionId: 
+    notReady: 1
+  - id: 0237
+    originalId: 
+    descriptionId: 
+    notReady: 1
+  - id: 0238
+    originalId: 
+    descriptionId: 
+    notReady: 1
+  - id: 0239
+    originalId: 
+    descriptionId: 
+    notReady: 1
   - id: 0240
     originalId: 
+    descriptionId: 
     notReady: 0
   dsod:
   - id: 0301
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0302
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0303
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0304
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0305
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0306
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0307
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0308
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0309
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0315
     originalId: 
+    descriptionId: 
     notReady: 0
+  - id: 0331
+    originalId: 
+    descriptionId: 
+    notReady: 1
+  - id: 0332
+    originalId: 
+    descriptionId: 
+    notReady: 1
+  - id: 0333
+    originalId: 
+    descriptionId: 
+    notReady: 1
   zexal:
   - id: 0401
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0404
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0405
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0406
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0407
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0409
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0410
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0411
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0412
     originalId: 
+    descriptionId: 
     notReady: 0
+  - id: 0413
+    originalId: 
+    descriptionId: 
+    notReady: 1
+  - id: 0414
+    originalId: 
+    descriptionId: 
+    notReady: 1
   - id: 0415
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0417
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0418
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0419
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0420
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0422
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0423
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0424
     originalId: 
+    descriptionId: 
+    notReady: 0
+  - id: 0431
+    originalId: 
+    descriptionId: 
+    notReady: 1
+  - id: 0433
+    originalId: 
+    descriptionId: 
+    notReady: 1
+  - id: 0434
+    originalId: 
+    descriptionId: 
+    notReady: 1
+  - id: 0435
+    originalId: 
+    descriptionId: 
+    notReady: 1
+  - id: 0441
+    originalId: 
+    descriptionId: 0419
+    notReady: 0
+  - id: 0442
+    originalId: 
+    descriptionId: 0420
     notReady: 0
   - id: 0443
     originalId: 
+    descriptionId: 0424
     notReady: 0
   - id: 0444
     originalId: 
+    descriptionId: 0423
     notReady: 0
   - id: 0445
     originalId: 
+    descriptionId: 0422
     notReady: 0
+  - id: 0446
+    originalId: 
+    descriptionId: 0422
+    notReady: 1
   - id: 0448
     originalId: 
+    descriptionId: 0417
     notReady: 0
   arcv:
   - id: 0501
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0502
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0503
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0504
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0505
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0506
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0507
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0508
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0509
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0510
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0511
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0512
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0513
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0514
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0532
-    originalId: 0202
+    originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0533
-    originalId: 0203
+    originalId: 
+    descriptionId: 
     notReady: 0
   vrains:
   - id: 0601
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0602
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0603
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0604
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0605
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0608
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0609
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0610
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0612
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0849
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0850
     originalId: 
+    descriptionId: 
     notReady: 0
   sevens:
   - id: 0701
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0702
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0703
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0704
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0705
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0706
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0707
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0708
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0709
     originalId: 
+    descriptionId: 
     notReady: 0
+  - id: 0711
+    originalId: 
+    descriptionId: 
+    notReady: 1
   - id: 0712
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0715
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0717
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0853
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0854
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0855
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0856
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0857
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0858
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0859
     originalId: 
-    notReady: 0
+    descriptionId: 
+    notReady: 1
   npc:
   - id: 0801
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0803
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0806
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0808
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0809
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0811
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0813
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0816
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0818
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0819
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0821
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0823
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0825
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0827
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0829
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0830
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0831
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0832
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0833
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0834
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0835
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0836
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0837
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0838
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0839
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0840
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0841
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0842
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0843
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0844
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0845
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0846
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0847
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0848
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0851
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0852
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0862
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0863
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0864
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0865
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0866
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0869
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 9995
     originalId: 
+    descriptionId: 
     notReady: 0
   gorush:
   - id: 0901
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0902
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0903
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0904
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0905
     originalId: 
+    descriptionId: 
     notReady: 0
   - id: 0906
     originalId: 
+    descriptionId: 
     notReady: 0
   language: zh-CN

Assets/Scripts/MDPro3/ScriptableObjects/Characters.cs

@@ -14,6 +14,7 @@ namespace MDPro3
         {
             public string id;
             public string originalId;
+            public string descriptionId;
             public bool notReady;
 
             public readonly string GetOriginalId()
@@ -33,6 +34,8 @@ namespace MDPro3
         public List<SeriesCharacter> npc;
         public List<SeriesCharacter> gorush;
 
+        private List<List<SeriesCharacter>> characters;
+
         NPC_Names names;
         NPC_Profiles profiles;
 
@@ -94,36 +97,19 @@ namespace MDPro3
 
         public string GetCharacterOriginalId(string charaID)
         {
-            foreach (var c in dm)
-                if (c.id == charaID)
-                    return c.GetOriginalId();
-            foreach (var c in gx)
-                if (c.id == charaID)
-                    return c.GetOriginalId();
-            foreach (var c in _5ds)
-                if (c.id == charaID)
-                    return c.GetOriginalId();
-            foreach (var c in dsod)
-                if (c.id == charaID)
-                    return c.GetOriginalId();
-            foreach (var c in zexal)
-                if (c.id == charaID)
-                    return c.GetOriginalId();
-            foreach (var c in arcv)
-                if (c.id == charaID)
-                    return c.GetOriginalId();
-            foreach (var c in vrains)
-                if (c.id == charaID)
-                    return c.GetOriginalId();
-            foreach (var c in sevens)
-                if (c.id == charaID)
-                    return c.GetOriginalId();
-            foreach (var c in npc)
-                if (c.id == charaID)
-                    return c.GetOriginalId();
-            foreach (var c in gorush)
-                if (c.id == charaID)
-                    return c.GetOriginalId();
+            foreach(var c in characters)
+                foreach (var ch in c)
+                    if (ch.id == charaID)
+                        return ch.GetOriginalId();
+            return charaID;
+        }
+
+        public string GetCharacterDescriptionId(string charaID)
+        {
+            foreach (var c in characters)
+                foreach (var ch in c)
+                    if (ch.id == charaID)
+                        return ch.descriptionId;
             return charaID;
         }
 
@@ -138,6 +124,10 @@ namespace MDPro3
             names = JsonConvert.DeserializeObject<NPC_Names>(File.ReadAllText(path));
             path = Program.PATH_DATA + "DuelLinks_Profile.json";
             profiles = JsonConvert.DeserializeObject<NPC_Profiles>(File.ReadAllText(path));
+            characters = new List<List<SeriesCharacter>>()
+            {
+                dm, gx, _5ds, dsod, zexal, arcv, vrains, sevens, npc, gorush
+            };
             initialized = true;
             instance = this;
         }
@@ -178,10 +168,11 @@ namespace MDPro3
         {
             if (!initialized)
                 Initialize();
+            var value = string.Empty;
 
             if (profiles.PROFILE.TryGetValue("ID" + id, out var data))
             {
-                return language switch
+                value = language switch
                 {
                     "ja-JP" => data.japanese,
                     "en-US" => data.english,
@@ -197,8 +188,31 @@ namespace MDPro3
                     _ => data.english,
                 };
             }
-            else
-                return string.Empty;
+
+            if(string.IsNullOrEmpty(value))
+            {
+                var dID = GetCharacterDescriptionId(id);
+                if (profiles.PROFILE.TryGetValue("ID" + dID, out var data2))
+                {
+                    value = language switch
+                    {
+                        "ja-JP" => data2.japanese,
+                        "en-US" => data2.english,
+                        "fr-FR" => data2.french,
+                        "it-IT" => data2.italian,
+                        "de-DE" => data2.german,
+                        "es-ES" => data2.spanish,
+                        "pt-BR" => data2.portuguese,
+                        "ru-RU" => data2.russian,
+                        "ko-KR" => data2.korean,
+                        "zh-TW" => data2.tChinese,
+                        "zh-CN" => data2.sChinese,
+                        _ => data2.english,
+                    };
+                }
+            }
+
+            return value;
         }
     }