Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1 into main
This commit is contained in:
commit
bfdbd7742b
Binary file not shown.
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
@ -16,7 +16,7 @@ MonoBehaviour:
|
||||
- GiantType: 2
|
||||
Name: "\u857E\u7C73\u8389\u4E9A \xB7 \u65AF\u5361\u96F7\u7279"
|
||||
Desc: "\u9970\u6F14<color=red>\u5965\u897F\u91CC\u65AF</color>\u7684\u9C9C\u7EA2\u5E7C\u6708\u3002\u5979\u662F\u7EA2\u9B54\u9986\u81F3\u9AD8\u65E0\u4E0A\u7684\u4E3B\u4EBA\uFF0C\u547D\u8FD0\u4E0E\u5A01\u4E25\u7684\u5316\u8EAB\uFF0C\u4E3A\u4E86\u90A3\u5EA7\u201C\u9AD8\u96C5\u201D\u7684\u51A0\u519B\u5956\u676F\u800C\u53C2\u8D5B\u3002"
|
||||
Diag: "\u54FC\u54FC\uFF0C\u8FD9\u53EF\u662F\u6211\u91CD\u91D1\u4E70\u901A\u88C1\u5224\u9009\u5230\u7684\u6700\u5F3A\u9635\u8425\u2026\u2026\u4F60\u8BF4\u6211\u88AB\u9A97\u4E86\uFF1F\u624D\u3001\u624D\u6CA1\u6709\uFF01"
|
||||
Diag: "\u54FC\u54FC\uFF0C\u8FD9\u53EF\u662F\u6211\u91CD\u91D1\u4E70\u901A\u88C1\u5224\u9009\u5230\u7684\u6700\u5F3A\u9635\u8425\u2026\u2026\u4F60\u8BF4\u6211\u88AB\u9A97\u4E86\uFF1F\u4E0D\u3001\u4E0D\u53EF\u80FD\uFF01"
|
||||
EnglishName: REMILIA SCARLET
|
||||
DiagColor: {r: 0.9176471, g: 0.34901962, b: 0.3529412, a: 1}
|
||||
Illust: {fileID: 21300000, guid: d4661e5af1f33b94ea56ac7d7b30b512, type: 3}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -127,8 +127,8 @@ MonoBehaviour:
|
||||
AchivePreId: 214
|
||||
- GiantType: 15
|
||||
Name: 16669
|
||||
Desc: 17128
|
||||
Diag: 17100
|
||||
Desc: 17225
|
||||
Diag: 17226
|
||||
EnglishName: HONG MEILING
|
||||
DiagColor: {r: 0.9176471, g: 0.34901962, b: 0.3529412, a: 1}
|
||||
Illust: {fileID: 21300000, guid: 3756265d254e8e542b0c198d11bf75d4, type: 3}
|
||||
|
||||
@ -172816,4 +172816,904 @@ MonoBehaviour:
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17137
|
||||
ZH: "\u7D2F\u8BA1\u51FA\u621810\u573A\u6E38\u620F"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17138
|
||||
ZH: "\u7D2F\u8BA1\u51FA\u621820\u573A\u6E38\u620F"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17139
|
||||
ZH: "\u7D2F\u8BA1\u51FA\u621830\u573A\u6E38\u620F"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17140
|
||||
ZH: "\u4E94\u9053\u96BE\u9898\u7684\u4E00\u767E\u65E5\u738B\u671D"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17141
|
||||
ZH: "\u6C38\u6052\u4E0E\u987B\u81FE\u987B\u81FE\u6CD5\u5178\u7684\u7F16\u7E82\u8005\u7F6A\u4EBA"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17142
|
||||
ZH: "\u7EDD\u4E0D\u518D\u628A\u4F60\u7559\u5728\u963F\u65AF\u4F69\u6069"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17143
|
||||
ZH: "\u5904\u65B9\u7B3A\u4E0A\u7684\u884C\u519B\u8DEF\u7EBF"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17144
|
||||
ZH: "\u8FD9\u5242\u91CF\u6CA1\u95EE\u9898\u6708\u7403\u4EBA\u90FD\u5728\u5403"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17145
|
||||
ZH: "\u5F71\u5B50\u91CC\u7684\u5143\u5E05\u6756"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17146
|
||||
ZH: "\u5E1D\u4ECE\u4E0D\u6295\u63B7\u9AB0\u5B50"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17147
|
||||
ZH: "\u56DB\u5341\u53F6\u7684\u5E78\u8FD0"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17148
|
||||
ZH: "\u5E78\u8FD0\u8C41\u514D\u5238"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17149
|
||||
ZH: "\u9891\u8C31\u8DC3\u8FC1"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17150
|
||||
ZH: "\u91CF\u4EA7\u578B\u6708\u5154"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17151
|
||||
ZH: "\u67D3\u7EA2\u6708\u5149\u7684\u963F\u5C14\u79D1\u83B1"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17152
|
||||
ZH: "\u5317\u65B9\u7684\u4E0D\u6B7B\u9E1F\u4E4B\u738B"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17153
|
||||
ZH: "\u5BBF\u654C\u7684\u6700\u9AD8\u793C\u4EEA"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17154
|
||||
ZH: "\u4E8E\u4E1A\u706B\u4E2D\u52A0\u5195"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17155
|
||||
ZH: "\u5B88\u77E2\u738B\u5BA4\u7684\u5947\u8FF9"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17156
|
||||
ZH: "\u65E0\u5FE7\u5BAB\u7684\u5FA1\u67F1\u796D"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17157
|
||||
ZH: "\u571F\u8C46\u5927\u738B\u4E0E\u6838\u80FD\u5C0A\u795E"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17158
|
||||
ZH: "\u8482\u5C14\u897F\u7279\u571F\u8457\u795E"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17159
|
||||
ZH: "\u77E2\u8F66\u83CA\u7684\u8BC5\u5492"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17160
|
||||
ZH: "\u590F\u6D1B\u6ED5\u5821\u7684\u86D9\u9E23"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17161
|
||||
ZH: "\u94C1\u8840\u98CE\u795D"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17162
|
||||
ZH: "\u5E38\u8BC6\u63AE\u5BA2"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17163
|
||||
ZH: "\u5B88\u77E2\u6587\u5316\u6597\u4E89"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17164
|
||||
ZH: "\u6218\u4E89\u8BBA\uFF1A\u65B0\u95FB\u8FF7\u96FE"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17165
|
||||
ZH: "\u634F\u9020\u4E5F\u662F\u65B0\u95FB\u7684\u4E00\u90E8\u5206"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17166
|
||||
ZH: "\u91C7\u8BBF\u662F\u653F\u6CBB\u7684\u5EF6\u7EED"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17167
|
||||
ZH: "\u7384\u6B66\u4E4B\u6CFD\u7684\u5317\u65B9\u5341\u5B57\u519B"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17168
|
||||
ZH: "\u5766\u80FD\u5821\u7684\u5343\u91CC\u773C"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17169
|
||||
ZH: "\u5927\u56E2\u957F\u7684\u5C06\u68CB\u65F6\u95F4"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17170
|
||||
ZH: "\u5357\u65B9\u7684\u95FA\u623F"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17171
|
||||
ZH: "\u62C9\u7F8E\u897F\u65AF\u7684\u91CE\u671B"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17172
|
||||
ZH: "\u7F2A\u65AF\u5723\u6BBF"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17173
|
||||
ZH: "\u6700\u540E\u4E00\u4F4D\u56FE\u4E66\u7BA1\u7406\u5458"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17174
|
||||
ZH: "\u767D\u57CE\u4E4B\u4E3B"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17175
|
||||
ZH: "\u83B2\u4E0E\u838E\u8349\u4E4B\u62E5"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17176
|
||||
ZH: "\u80E1\u592B\u7684\u5730\u5E73\u7EBF"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17177
|
||||
ZH: "\u6C38\u6052\u7684\u9636\u68AF"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17178
|
||||
ZH: "\u592A\u9633\u7684\u5947\u8FF9"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17179
|
||||
ZH: "\u65E0\u58F0\u7684\u5B88\u671B\u8005"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17180
|
||||
ZH: "\u5730\u5E73\u7EBF\u4E0A\u7684\u8377\u9C81\u65AF"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17181
|
||||
ZH: "\u963F\u62DC\u591A\u65AF\u738B\u8868"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17182
|
||||
ZH: "\u51A5\u738B\u590D\u751F\u4E4B\u5730"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17183
|
||||
ZH: "\u56DB\u671D\u5BA0\u513F"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17184
|
||||
ZH: "\u68EE\u6797\u91CC\u7684\u65B0\u7F57\u9A6C"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17185
|
||||
ZH: "\u7687\u5E1D\u7684\u544A\u522B"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17186
|
||||
ZH: "\u8C01\u624D\u662F\u771F\u7D22\u90A6\uFF1F"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17187
|
||||
ZH: "\u62C9\u4E01\u5FC3\u810F"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17188
|
||||
ZH: "\u94FA\u8DEF\u77F3\u4E0B\u4FBF\u662F\u6C99\u6EE9"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17189
|
||||
ZH: "\u9EC4\u91D1\u65F6\u4EE3\u7684\u6A71\u7A97"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17190
|
||||
ZH: "\u8461\u8404\u9152\u4E0E\u8517\u7CD6"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17191
|
||||
ZH: "\u81EA\u7531\u4E4B\u7AFF"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17192
|
||||
ZH: "\u62FF\u7834\u4ED1\u535A\u7269\u9986"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17193
|
||||
ZH: "\u4F60\u53BB\u4F60\u7684\u51E1\u5C14\u8D5B"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17194
|
||||
ZH: "\u72FC\u6797"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17195
|
||||
ZH: "\u4E3A\u4E86\u5927\u519B\u56E2\u7684\u8363\u8000"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17196
|
||||
ZH: "\u53E4\u7F57\u9A6C\u56DE\u97F3"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17197
|
||||
ZH: "\u7687\u5E1D\u7684\u6700\u540E\u8DEF\u8FC7"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17198
|
||||
ZH: "\u96E8\u679C\u7684\u6559\u5802"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17199
|
||||
ZH: "\u585E\u7EB3\u6CB3\u7684\u51A0\u5195"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17200
|
||||
ZH: "\u897F\u5CB1\u5C9B\u7684\u51E4\u51F0"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17201
|
||||
ZH: "\u5929\u6587\u738B\u671D\u5361\u897F\u5C3C"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17202
|
||||
ZH: "\u6CD5\u5170\u897F\u661F\u8FB0\u4E4B\u773C"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17203
|
||||
ZH: "\u5DF4\u9ECE\u672C\u521D\u5B50\u5348\u7EBF"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17204
|
||||
ZH: "\u548C\u5E73\u4E0E\u590D\u4EC7"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17205
|
||||
ZH: "\u83E9\u63D0\u6811\u4E0B\u5927\u8857\u7684\u666E\u7F57\u76AE\u6765"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17206
|
||||
ZH: "\u67CF\u6797\u5899\u7684\u5E7D\u7075"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17207
|
||||
ZH: "\u5FB7\u610F\u5FD7\u7684\u7B2C\u4E00\u675F\u5149"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17208
|
||||
ZH: "\u6D6A\u6F2B\u4E3B\u4E49\u7684\u6447\u7BEE"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17209
|
||||
ZH: "\u8363\u8A89\u7684\u76D1\u7981"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17210
|
||||
ZH: "\u6A61\u6728\u6869\u4E0A\u7684\u660E\u73E0"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17211
|
||||
ZH: "\u5730\u6BEF\u3001\u5496\u5561\u4E0E\u9999\u6599"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17212
|
||||
ZH: "\u4E07\u56FD\u8D27\u4ED3"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17213
|
||||
ZH: "\u8DEF\u5FB7\u7EF4\u5E0C\u672A\u7ADF\u4E4B\u68A6"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17214
|
||||
ZH: "\u732E\u7ED9\u74E6\u683C\u7EB3\u7684\u5723\u6BBF"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17215
|
||||
ZH: "\u6211\u80FD\u62CD\u7167\u5417"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17216
|
||||
ZH: "\u9EC4\u91D1\u827E\u5C14\u838E"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17217
|
||||
ZH: "\u4E09\u6218\u4E09\u80DC"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17218
|
||||
ZH: "\u65E5\u8033\u66FC\u5C3C\u4E9A\u7684\u8F74\u7EBF"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17219
|
||||
ZH: "\u5C3C\u4F2F\u9F99\u6839\u7684\u6307\u73AF"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17220
|
||||
ZH: "\u8DEF\u5FB7\u7EF4\u5E0C\u7684\u53CB\u60C5"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17221
|
||||
ZH: "\u5C3C\u91C7\u7684\u80CC\u5F71"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17222
|
||||
ZH: "\u535A\u767B\u6E56\u7554\u65E5\u591C\u8F70\u9E23"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17223
|
||||
ZH: "\u4E16\u754C\u9996\u5BB6\u822A\u7A7A\u516C\u53F8"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17224
|
||||
ZH: "\u5174\u767B\u5821\u7684\u60B2\u5267"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17225
|
||||
ZH: "\u9970\u6F14<color=red>\u6761\u987F\u9A91\u58EB\u56E2\u957F</color>\u7684\u767D\u72FC\u5929\u72D7\u3002\u5996\u602A\u4E4B\u5C71\u8D1F\u8D23\u5DE1\u903B\u7684\u8B66\u536B\u3002\u53D7\u5230\u6587\u7684\u9080\u8BF7\uFF0C\u8E0C\u8E87\u4E00\u756A\u540E\u51B3\u5B9A\u6765\u53C2\u8D5B\u3002"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
- ID: 17226
|
||||
ZH: "\u54FC\uFF0C\u6587\u90A3\u5BB6\u4F19\u2026\u2026\u7F62\u4E86\u3002\u8FD9\u4E2A\u2018\u5E1D\u56FD\u2019\u68CB\u4F3C\u4E4E\u548C\u5C06\u68CB\u6709\u51E0\u5206\u7C7B\u4F3C\u2026\u2026\u5E94\u8BE5\u4E5F\u80FD\u78E8\u7EC3\u601D\u7EF4\u548C\u610F\u5FD7\u5427\u3002"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
IsProperNoun: 0
|
||||
IsDialogue: 0
|
||||
DialogueSpeaker:
|
||||
IsDeprecated: 0
|
||||
TargetTypes: 0100000001000000010000000100000001000000
|
||||
|
||||
@ -2750,7 +2750,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 422417801502647100, guid: e880e5b986f49d242911f0320df9536d, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -311.1755
|
||||
value: -166.15051
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 422417801502647100, guid: e880e5b986f49d242911f0320df9536d, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
@ -2899,7 +2899,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 422417801502647100, guid: e880e5b986f49d242911f0320df9536d, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -192.70529
|
||||
value: -105.69031
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 422417801502647100, guid: e880e5b986f49d242911f0320df9536d, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
@ -3048,7 +3048,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 422417801502647100, guid: e880e5b986f49d242911f0320df9536d, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -74.2351
|
||||
value: -45.230103
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 422417801502647100, guid: e880e5b986f49d242911f0320df9536d, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
|
||||
@ -223,7 +223,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 230
|
||||
ID: 254
|
||||
FontID: 0
|
||||
TextCfg: []
|
||||
--- !u!1 &633716644431679918
|
||||
@ -889,7 +889,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 147
|
||||
ID: 268
|
||||
FontID: 0
|
||||
TextCfg: []
|
||||
--- !u!1 &3907692880731710744
|
||||
@ -1569,14 +1569,13 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
TopTitle: {fileID: 4685822715545856608}
|
||||
Illustration: {fileID: 2317087997159872414}
|
||||
WonderImage: {fileID: 2317087997159872414}
|
||||
GroundImage: {fileID: 304671904966283422}
|
||||
Name: {fileID: 4938534216973850944}
|
||||
CivName: {fileID: 2346263799474242278}
|
||||
CivBG: {fileID: 1787739635780798495}
|
||||
CivRect: {fileID: 2947719523726246818}
|
||||
Desc: {fileID: 2052307742186324816}
|
||||
Dialogue: {fileID: 0}
|
||||
DialogueAvatar: {fileID: 0}
|
||||
AchieveItems:
|
||||
- {fileID: 2891149376770961961}
|
||||
- {fileID: 4052203695783566288}
|
||||
|
||||
@ -3368,6 +3368,22 @@ PrefabInstance:
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -0.00038528442
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2053365445280533371, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
propertyPath: m_Color.a
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2053365445280533371, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
propertyPath: m_Color.b
|
||||
value: 0.509434
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2053365445280533371, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
propertyPath: m_Color.g
|
||||
value: 0.509434
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2053365445280533371, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
propertyPath: m_Color.r
|
||||
value: 0.509434
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2955504482092516634, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0
|
||||
@ -3448,10 +3464,78 @@ PrefabInstance:
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3036021704648018521, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
propertyPath: m_fontColor.b
|
||||
value: 0.38364768
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3036021704648018521, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
propertyPath: m_fontColor.g
|
||||
value: 0.38244122
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3036021704648018521, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
propertyPath: m_fontColor.r
|
||||
value: 0.38259205
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3036021704648018521, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
propertyPath: m_fontColor32.rgba
|
||||
value: 4284637794
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5059836484227513041, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
propertyPath: pressScale
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5686079131557845689, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 249.0387
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5686079131557845689, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 72.3561
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5686079131557845689, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 145
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5686079131557845689, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 1.5999985
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5851370632687495647, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
propertyPath: m_Type
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5851370632687495647, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
propertyPath: m_Sprite
|
||||
value:
|
||||
objectReference: {fileID: 21300000, guid: 9784fb4d7ab01bb4db751b6f1f4d2cbd, type: 3}
|
||||
- target: {fileID: 5851370632687495647, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
propertyPath: m_Color.a
|
||||
value: 0.5294118
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5851370632687495647, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
propertyPath: m_Color.b
|
||||
value: 0.23899364
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5851370632687495647, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
propertyPath: m_Color.g
|
||||
value: 0.23899364
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5851370632687495647, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
propertyPath: m_Color.r
|
||||
value: 0.23899364
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5851370632687495647, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5851370632687495647, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
propertyPath: m_PreserveAspect
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6247276757970792633, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
propertyPath: m_Color.a
|
||||
value: 0.5019608
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7763630946422454447, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: MainUIButton
|
||||
|
||||
@ -214,6 +214,18 @@ public class UnitTypeDataAssets : ScriptableObject
|
||||
return false;
|
||||
}
|
||||
|
||||
public bool GetGiantTypeByChessType(ChessType chess, ForceEnum force, out GiantType giantType)
|
||||
{
|
||||
foreach(var t in UnitTypeList)
|
||||
if (t.GiantForceId == Table.Instance.TransForceEnumToForceId(force) && t.ChessType == chess)
|
||||
{
|
||||
giantType = t.GiantType;
|
||||
return true;
|
||||
}
|
||||
giantType = GiantType.None;
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public bool GetUnitSpriteByInfo(UnitTypeInfo unitInfo, PlayerData player, out Sprite sprite)
|
||||
|
||||
@ -167,9 +167,9 @@ namespace RuntimeData
|
||||
|
||||
|
||||
// ------------------------------- 查询辅助类方法
|
||||
public bool GetSmallIdByChessType(ChessType chessType, out uint smallid)
|
||||
private bool GetSmallIdByChessType(ChessType chessType, out uint part_smallid)
|
||||
{
|
||||
smallid = chessType switch
|
||||
part_smallid = chessType switch
|
||||
{
|
||||
ChessType.Rook => 5,
|
||||
ChessType.Knight => 4,
|
||||
@ -178,7 +178,7 @@ namespace RuntimeData
|
||||
ChessType.King => 1,
|
||||
_ => 0
|
||||
};
|
||||
return smallid != 0;
|
||||
return part_smallid != 0;
|
||||
}
|
||||
|
||||
public bool GetSmallIdByGiantType(GiantType giantType, out uint smallid)
|
||||
@ -186,7 +186,10 @@ namespace RuntimeData
|
||||
smallid = 0;
|
||||
if (!Table.Instance.UnitTypeDataAssets.GetGiantTypeChessType(giantType, out ChessType chessType))
|
||||
return false;
|
||||
return GetSmallIdByChessType(chessType, out smallid);
|
||||
if (!Table.Instance.LibraryDataAssets.GetLibraryInfoByGiant(giantType, out var libInfo)) return false;
|
||||
smallid = (uint)libInfo.AchivePreId % 100;
|
||||
return true;
|
||||
|
||||
}
|
||||
|
||||
public bool GetSmallIdByWonderAndEmpire(Empire empire ,WonderTypeEnum wonder, out uint smallid)
|
||||
|
||||
@ -214,7 +214,7 @@ namespace Logic.Editor
|
||||
if (_asset.Data.GetAchievementItem(item.BigID, item.SmallID, item.InternalID) != null) continue;
|
||||
|
||||
var condition = new BuildWonderConditionCondition();
|
||||
condition.TargetCount = 10;
|
||||
condition.TargetCount = 10*j;
|
||||
condition.Wonder = (WonderLibrary)i;
|
||||
item.Conditions.Add(condition);
|
||||
_asset.Data.AchievementList.Add(item);
|
||||
|
||||
@ -64,11 +64,11 @@ namespace TH1_UI.View.Outside
|
||||
}
|
||||
|
||||
|
||||
private void SetItemList()
|
||||
private void SetItemList(List<GameRecord> dataList)
|
||||
{
|
||||
var dataSize = GameRecordManager.Instance.GameRecordData.Records.Count;
|
||||
var dataList = GameRecordManager.Instance.GameRecordData.Records;
|
||||
if (dataSize > 100) dataSize = 100;
|
||||
int dataSize = Mathf.Min(dataList.Count,100);
|
||||
//var dataSize = GameRecordManager.Instance.GameRecordData.Records.Count;
|
||||
//var dataList = GameRecordManager.Instance.GameRecordData.Records;
|
||||
while (_items.Count < dataSize)
|
||||
{
|
||||
var obj = Instantiate(ItemPrefab, ItemList);
|
||||
@ -80,6 +80,7 @@ namespace TH1_UI.View.Outside
|
||||
for (int i = 0; i < _items.Count; i++)
|
||||
{
|
||||
_items[i].gameObject.SetActive(i < dataSize);
|
||||
if (i >= dataSize) continue;
|
||||
_items[i].SetContent(dataList[i]);
|
||||
}
|
||||
}
|
||||
@ -103,7 +104,7 @@ namespace TH1_UI.View.Outside
|
||||
DropdownForce.AddOptions(options);
|
||||
|
||||
DropdownForce.onValueChanged.RemoveAllListeners();
|
||||
DropdownForce.onValueChanged.AddListener(OnDropdownForceSelect);
|
||||
DropdownForce.onValueChanged.AddListener(OnOrderUpdate);
|
||||
|
||||
}
|
||||
|
||||
@ -115,14 +116,7 @@ namespace TH1_UI.View.Outside
|
||||
PlayerCountDropdown.ClearOptions();
|
||||
PlayerCountDropdown.AddOptions(PlayerCountData);
|
||||
PlayerCountDropdown.onValueChanged.RemoveAllListeners();
|
||||
PlayerCountDropdown.onValueChanged.AddListener(OnPlayerCountSelect);
|
||||
}
|
||||
|
||||
private void OnPlayerCountSelect(int index)
|
||||
{
|
||||
if (PlayerCountData == null || index < 0 || index >= PlayerCountData.Count) return;
|
||||
Debug.Log($"PlayerCount selected: {PlayerCountData[index]}");
|
||||
// TODO: 根据需要在这里处理筛选逻辑
|
||||
PlayerCountDropdown.onValueChanged.AddListener(OnOrderUpdate);
|
||||
}
|
||||
|
||||
// 新增：排序下拉设置
|
||||
@ -133,25 +127,56 @@ namespace TH1_UI.View.Outside
|
||||
OrderDropdown.ClearOptions();
|
||||
OrderDropdown.AddOptions(OrderDropData);
|
||||
OrderDropdown.onValueChanged.RemoveAllListeners();
|
||||
OrderDropdown.onValueChanged.AddListener(OnOrderSelect);
|
||||
OrderDropdown.onValueChanged.AddListener(OnOrderUpdate);
|
||||
}
|
||||
|
||||
private void OnOrderSelect(int index)
|
||||
private void OnOrderUpdate(int index)
|
||||
{
|
||||
if (OrderDropData == null || index < 0 || index >= OrderDropData.Count) return;
|
||||
Debug.Log($"Order selected: {OrderDropData[index]}");
|
||||
// TODO: 根据需要在这里处理排序逻辑
|
||||
var gameMode = GameMode.DOMINATION;
|
||||
var forceEnum = DropdownForce.value switch
|
||||
{
|
||||
0 => ForceEnum.Common,
|
||||
1 => ForceEnum.Remilia,
|
||||
2 => ForceEnum.Kaguya,
|
||||
3 => ForceEnum.Kanako,
|
||||
_ => ForceEnum.Common
|
||||
};
|
||||
var playerCount = PlayerCountDropdown.value switch
|
||||
{
|
||||
0 => 0,
|
||||
1 => 2,
|
||||
2 => 3,
|
||||
3 => 4,
|
||||
4 => 5,
|
||||
5 => 6,
|
||||
6 => 7,
|
||||
7 => 8,
|
||||
_ => 0
|
||||
};
|
||||
bool isScore = false;
|
||||
bool isTime = false;
|
||||
bool isTurn = false;
|
||||
bool order = false;
|
||||
switch( OrderDropdown.value)
|
||||
{
|
||||
case 0:
|
||||
isTime = true;
|
||||
break;
|
||||
case 1:
|
||||
isTurn = true;
|
||||
break;
|
||||
case 2:
|
||||
isTime = true;
|
||||
order = true;
|
||||
break;
|
||||
}
|
||||
|
||||
SetItemList(GameRecordManager.Instance.GetSortGameRecordList(gameMode,forceEnum,playerCount,isScore,isTurn,isTime,order));
|
||||
}
|
||||
|
||||
private void OnDropdownForceSelect(int index)
|
||||
{
|
||||
if(!Table.Instance.PlayerDataAssets.GetPlayerInfo(DropdownForceData[index].Civ, DropdownForceData[index].Force, out var info))return;
|
||||
Debug.Log(MultilingualManager.Instance.GetMultilingualText(info.ForceName));
|
||||
}
|
||||
|
||||
|
||||
public void SetContent(ShowUIOutsideHistory evt)
|
||||
{
|
||||
SetItemList();
|
||||
SetItemList(GameRecordManager.Instance.GameRecordData.Records);
|
||||
SetDropForce();
|
||||
SetPlayerCountDropForce();
|
||||
SetOrderDropForce();
|
||||
|
||||
@ -84,7 +84,7 @@ namespace TH1_UI.View.Outside
|
||||
{
|
||||
if (!AchievementDataManager.Instance.GetSmallIdByWonderAndEmpire(empire,wonderType, out var smallid)) continue;
|
||||
bool isFinished = AchievementDataManager.Instance.IsFinished(3, smallid, k);
|
||||
if(Stars.Count <= k)continue;
|
||||
if(Stars.Count < k)continue;
|
||||
Stars[(int)k - 1].sprite = isFinished ? StarImg : StarImgGray;
|
||||
}
|
||||
|
||||
|
||||
@ -21,16 +21,10 @@ public class UIOutsideMenuButtonMono : MonoBehaviour
|
||||
|
||||
public Image Icon;
|
||||
|
||||
public void SetContent()
|
||||
public void SetContent(GiantType giant)
|
||||
{
|
||||
var forceList = new List<ForceEnum>() { ForceEnum.Remilia, ForceEnum.Kaguya, ForceEnum.Kanako };
|
||||
var chessList = new List<ChessType>()
|
||||
{ ChessType.King, ChessType.Knight, ChessType.Queen, ChessType.Rook, ChessType.Bishop };
|
||||
var force = forceList[Random.Range(0, forceList.Count)];
|
||||
var chess = chessList[Random.Range(0, chessList.Count)];
|
||||
if (Table.Instance.UnitTypeDataAssets.GetUnitSpriteByChessType(chess, force, out var sprite))
|
||||
Icon.sprite = sprite;
|
||||
|
||||
if (!Table.Instance.UnitTypeDataAssets.GetUnitSpriteByGiantType(giant, out var sprite)) return;
|
||||
Icon.sprite = sprite;
|
||||
}
|
||||
|
||||
void Start()
|
||||
|
||||
@ -22,6 +22,7 @@ using TMPro;
|
||||
using Unity.VisualScripting;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
using Random = UnityEngine.Random;
|
||||
|
||||
namespace TH1_UI.View.Outside
|
||||
{
|
||||
@ -70,11 +71,35 @@ namespace TH1_UI.View.Outside
|
||||
AboutPanel.OnInit();
|
||||
}
|
||||
|
||||
|
||||
private void GetRandomGiantList(int count,out List<GiantType> giantTypeList)
|
||||
{
|
||||
var forceList = new List<ForceEnum>() { ForceEnum.Remilia, ForceEnum.Kaguya, ForceEnum.Kanako };
|
||||
var chessList = new List<ChessType>()
|
||||
{ ChessType.King, ChessType.Knight, ChessType.Queen, ChessType.Rook, ChessType.Bishop };
|
||||
|
||||
giantTypeList = new List<GiantType>();
|
||||
int tct = 0;
|
||||
while (giantTypeList.Count < count && tct < 10000000)
|
||||
{
|
||||
var force = forceList[Random.Range(0, forceList.Count)];
|
||||
var chess = chessList[Random.Range(0, chessList.Count)];
|
||||
Table.Instance.UnitTypeDataAssets.GetGiantTypeByChessType(chess, force, out var giantType);
|
||||
bool same = false;
|
||||
foreach(var t in giantTypeList)
|
||||
if (t == giantType)
|
||||
same = true;
|
||||
if(!same) giantTypeList.Add(giantType);
|
||||
tct++;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public void SetContent(ShowUIOutsideMenu evt)
|
||||
{
|
||||
foreach(var t in ButtonList)
|
||||
t.SetContent();
|
||||
GetRandomGiantList(ButtonList.Count,out var giantTypeList);
|
||||
for(int i =0;i < ButtonList.Count;i++)
|
||||
ButtonList[i].SetContent(giantTypeList[i]);
|
||||
|
||||
StartButton.onClick.RemoveAllListeners();
|
||||
StartButton.onClick.AddListener(OnStartClicked);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user