kawagiri/TH1
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 9 Wiki Activity

bug修复

Browse Source
This commit is contained in:
kawagiri 2026-01-13 14:44:49 +08:00
parent 847dadd651
commit a341818a77
13 changed files with 189 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Tools/Multilingual.xlsx
View File

Binary file not shown.

14
Tools/MultilingualTxt.txt
View File

File diff suppressed because one or more lines are too long

4
Unity/Assets/Resources/ArtResources/TH1Units/Giant/FrenchReisenIllusion.png.meta
View File

@ -46,8 +46,8 @@ TextureImporter:
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
alignment: 9
spritePivot: {x: 0.5, y: 0.4}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1

26
Unity/Assets/Resources/DataAssets/ActionDataAssets.asset
View File

@ -4636,9 +4636,9 @@ MonoBehaviour:
PlayerActionType: 0
AIParamType: 0
ActionName: "\u8299\u5170\u6735\u9732\xB7\u65AF\u5361\u96F7\u7279"
Desc: "<color=yellow>[\u9A6C]\u804C\u9636\u82F1\u96C4</color>\u3002\u5168\u573A\u6700\u591A\u5B58\u5728\u7684\u6570\u91CF\u968F\u82F1\u96C4\u7B49\u7EA7\u63D0\u5347\u800C\u63D0\u5347\u3002\u6B7B\u4EA1\u540E3\u56DE\u5408\u5185\u4E0D\u53EF\u518D\u6B21\u51FA\u6218\u3002"
NeedTechDesc: 1
TechDesc: "\u53EF\u6D3E\u9063<color=yellow>[\u9A6C]\u804C\u9636</color>\u82F1\u96C4<color=yellow>\u8299\u5170\u6735\u9732\xB7\u65AF\u5361\u96F7\u7279</color>\u3002\u5168\u573A\u53EA\u80FD\u5B58\u5728\u81F3\u591A4\u4E2A<color=yellow>\u8299\u5170\u6735\u9732\u65AF\u5361\u96F7\u7279</color>\u3002\u5EFA\u9020\u795E\u50CF\u53EF\u4EE5\u63D0\u5347\u82F1\u96C4\u7ECF\u9A8C\u5E76\u5347\u7EA7\u3002"
Desc: "<color=yellow>[\u9A6C]\u804C\u9636\u82F1\u96C4</color>\u3002\u6B7B\u4EA1\u540E3\u56DE\u5408\u5185\u4E0D\u53EF\u518D\u6B21\u51FA\u6218\u3002"
NeedTechDesc: 0
TechDesc:
NeedLockDesc: 0
LockDesc:
Icon: {fileID: 21300000, guid: f4a89946e6d83f5498b8da8784d65ac4, type: 3}
@ -6652,7 +6652,7 @@ MonoBehaviour:
PlayerActionType: 0
AIParamType: 0
ActionName: "\u84EC\u83B1\u5C71\u8F89\u591C"
Desc:
Desc: "**<[\u738B]\u804C\u9636\u82F1\u96C4>**\u3002\u5168\u573A\u6700\u591A\u5B58\u5728\u4E00\u540D**<\u84EC\u83B1\u5C71\u8F89\u591C>**\u3002\u6B7B\u4EA1\u540E3\u56DE\u5408\u5185\u4E0D\u53EF\u518D\u6B21\u51FA\u6218\u3002"
NeedTechDesc: 0
TechDesc:
NeedLockDesc: 0
@ -6684,7 +6684,7 @@ MonoBehaviour:
PlayerActionType: 0
AIParamType: 0
ActionName: "\u516B\u610F\u6C38\u7433"
Desc:
Desc: "**<[\u540E]\u804C\u9636\u82F1\u96C4>**\u3002\u5168\u573A\u6700\u591A\u5B58\u5728\u4E00\u540D**<\u516B\u610F\u6C38\u7433>**\u3002\u6B7B\u4EA1\u540E3\u56DE\u5408\u5185\u4E0D\u53EF\u518D\u6B21\u51FA\u6218\u3002"
NeedTechDesc: 0
TechDesc:
NeedLockDesc: 0
@ -6716,7 +6716,7 @@ MonoBehaviour:
PlayerActionType: 0
AIParamType: 0
ActionName: "\u56E0\u5E61\u5E1D"
Desc:
Desc: "**<[\u76F8]\u804C\u9636\u82F1\u96C4>**\u3002\u5168\u573A\u6700\u591A\u5B58\u5728\u4E00\u540D**<\u56E0\u5E61\u5E1D>**\u3002\u6B7B\u4EA1\u540E3\u56DE\u5408\u5185\u4E0D\u53EF\u518D\u6B21\u51FA\u6218\u3002"
NeedTechDesc: 0
TechDesc:
NeedLockDesc: 0
@ -6748,7 +6748,7 @@ MonoBehaviour:
PlayerActionType: 0
AIParamType: 0
ActionName: "\u94C3\u4ED9\u4F18\u6619\u534E\u9662\u56E0\u5E61"
Desc:
Desc: "**<[\u9A6C]\u804C\u9636\u82F1\u96C4>**\u3002\u5168\u573A\u6700\u591A\u5B58\u5728\u4E00\u540D**<\u94C3\u4ED9\xB7\u4F18\u6619\u534E\u9662\xB7\u56E0\u5E61>**\u3002\u6B7B\u4EA1\u540E3\u56DE\u5408\u5185\u4E0D\u53EF\u518D\u6B21\u51FA\u6218\u3002"
NeedTechDesc: 0
TechDesc:
NeedLockDesc: 0
@ -6780,7 +6780,7 @@ MonoBehaviour:
PlayerActionType: 0
AIParamType: 0
ActionName: "\u85E4\u539F\u59B9\u7EA2"
Desc:
Desc: "**<[\u8F66]\u804C\u9636\u82F1\u96C4>**\u3002\u5168\u573A\u6700\u591A\u5B58\u5728\u4E00\u540D**<\u85E4\u539F\u59B9\u7EA2>**\u3002\u6B7B\u4EA1\u540E3\u56DE\u5408\u5185\u4E0D\u53EF\u518D\u6B21\u51FA\u6218\u3002"
NeedTechDesc: 0
TechDesc:
NeedLockDesc: 0
@ -6812,7 +6812,7 @@ MonoBehaviour:
PlayerActionType: 0
AIParamType: 0
ActionName: "\u516B\u5742\u795E\u5948\u5B50"
Desc:
Desc: "**<[\u738B]\u804C\u9636\u82F1\u96C4>**\u3002\u5168\u573A\u6700\u591A\u5B58\u5728\u4E00\u540D**<\u516B\u5742\u795E\u5948\u5B50>**\u3002\u6B7B\u4EA1\u540E3\u56DE\u5408\u5185\u4E0D\u53EF\u518D\u6B21\u51FA\u6218\u3002"
NeedTechDesc: 0
TechDesc:
NeedLockDesc: 0
@ -6844,7 +6844,7 @@ MonoBehaviour:
PlayerActionType: 0
AIParamType: 0
ActionName: "\u6D29\u77E2\u8BF9\u8BBF\u5B50"
Desc:
Desc: "**<[\u540E]\u804C\u9636\u82F1\u96C4>**\u3002\u5168\u573A\u6700\u591A\u5B58\u5728\u4E00\u540D**<\u6D29\u77E2\u8BF9\u8BBF\u5B50>**\u3002\u6B7B\u4EA1\u540E3\u56DE\u5408\u5185\u4E0D\u53EF\u518D\u6B21\u51FA\u6218\u3002"
NeedTechDesc: 0
TechDesc:
NeedLockDesc: 0
@ -6876,7 +6876,7 @@ MonoBehaviour:
PlayerActionType: 0
AIParamType: 0
ActionName: "\u4E1C\u98CE\u8C37\u65E9\u82D7"
Desc:
Desc: "**<[\u76F8]\u804C\u9636\u82F1\u96C4>**\u3002\u5168\u573A\u6700\u591A\u5B58\u5728\u4E00\u540D**<\u4E1C\u98CE\u8C37\u65E9\u82D7>**\u3002\u6B7B\u4EA1\u540E3\u56DE\u5408\u5185\u4E0D\u53EF\u518D\u6B21\u51FA\u6218\u3002"
NeedTechDesc: 0
TechDesc:
NeedLockDesc: 0
@ -6908,7 +6908,7 @@ MonoBehaviour:
PlayerActionType: 0
AIParamType: 0
ActionName: "\u5C04\u547D\u4E38\u6587"
Desc:
Desc: "**<[\u9A6C]\u804C\u9636\u82F1\u96C4>**\u3002\u5168\u573A\u6700\u591A\u5B58\u5728\u4E00\u540D**<\u5C04\u547D\u4E38\u6587>**\u3002\u6B7B\u4EA1\u540E3\u56DE\u5408\u5185\u4E0D\u53EF\u518D\u6B21\u51FA\u6218\u3002"
NeedTechDesc: 0
TechDesc:
NeedLockDesc: 0
@ -6940,7 +6940,7 @@ MonoBehaviour:
PlayerActionType: 0
AIParamType: 0
ActionName: "\u72AC\u8D70\u691B"
Desc:
Desc: "**<[\u8F66]\u804C\u9636\u82F1\u96C4>**\u3002\u5168\u573A\u6700\u591A\u5B58\u5728\u4E00\u540D**<\u72AC\u8D70\u691B>**\u3002\u6B7B\u4EA1\u540E3\u56DE\u5408\u5185\u4E0D\u53EF\u518D\u6B21\u51FA\u6218\u3002"
NeedTechDesc: 0
TechDesc:
NeedLockDesc: 0

16
Unity/Assets/Resources/Export/Achievement.asset
View File

@ -661,7 +661,7 @@ MonoBehaviour:
- Logic.Achievement.TrainGiantCondition, Assembly-CSharp, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
_jsonData:
- '{"TargetCount":10,"TargetGiant":9,"TrainCount":0}'
- '{"TargetCount":30,"TargetGiant":9,"TrainCount":0}'
- BigID: 2
SmallID: 7
InternalID: 1
@ -697,7 +697,7 @@ MonoBehaviour:
- Logic.Achievement.TrainGiantCondition, Assembly-CSharp, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
_jsonData:
- '{"TargetCount":1,"TargetGiant":8,"TrainCount":0}'
- '{"TargetCount":30,"TargetGiant":8,"TrainCount":0}'
- BigID: 2
SmallID: 8
InternalID: 1
@ -733,7 +733,7 @@ MonoBehaviour:
- Logic.Achievement.TrainGiantCondition, Assembly-CSharp, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
_jsonData:
- '{"TargetCount":10,"TargetGiant":8,"TrainCount":0}'
- '{"TargetCount":30,"TargetGiant":8,"TrainCount":0}'
- BigID: 2
SmallID: 9
InternalID: 1
@ -769,7 +769,7 @@ MonoBehaviour:
- Logic.Achievement.TrainGiantCondition, Assembly-CSharp, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
_jsonData:
- '{"TargetCount":10,"TargetGiant":10,"TrainCount":0}'
- '{"TargetCount":30,"TargetGiant":10,"TrainCount":0}'
- BigID: 2
SmallID: 10
InternalID: 1
@ -805,7 +805,7 @@ MonoBehaviour:
- Logic.Achievement.TrainGiantCondition, Assembly-CSharp, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
_jsonData:
- '{"TargetCount":10,"TargetGiant":10,"TrainCount":0}'
- '{"TargetCount":30,"TargetGiant":10,"TrainCount":0}'
- BigID: 2
SmallID: 11
InternalID: 1
@ -841,7 +841,7 @@ MonoBehaviour:
- Logic.Achievement.TrainGiantCondition, Assembly-CSharp, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
_jsonData:
- '{"TargetCount":10,"TargetGiant":11,"TrainCount":0}'
- '{"TargetCount":30,"TargetGiant":11,"TrainCount":0}'
- BigID: 2
SmallID: 12
InternalID: 1
@ -877,7 +877,7 @@ MonoBehaviour:
- Logic.Achievement.TrainGiantCondition, Assembly-CSharp, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
_jsonData:
- '{"TargetCount":10,"TargetGiant":12,"TrainCount":0}'
- '{"TargetCount":30,"TargetGiant":12,"TrainCount":0}'
- BigID: 2
SmallID: 13
InternalID: 1
@ -913,7 +913,7 @@ MonoBehaviour:
- Logic.Achievement.TrainGiantCondition, Assembly-CSharp, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
_jsonData:
- '{"TargetCount":1,"TargetGiant":15,"TrainCount":0}'
- '{"TargetCount":30,"TargetGiant":15,"TrainCount":0}'
- BigID: 2
SmallID: 14
InternalID: 1

26
Unity/Assets/Resources/Export/ActionDataAssets.asset
View File

@ -4636,9 +4636,9 @@ MonoBehaviour:
PlayerActionType: 0
AIParamType: 0
ActionName: 144
Desc: 1603
NeedTechDesc: 1
TechDesc: 1493
Desc: 17227
NeedTechDesc: 0
TechDesc:
NeedLockDesc: 0
LockDesc:
Icon: {fileID: 21300000, guid: f4a89946e6d83f5498b8da8784d65ac4, type: 3}
@ -6652,7 +6652,7 @@ MonoBehaviour:
PlayerActionType: 0
AIParamType: 0
ActionName: 171
Desc:
Desc: 17228
NeedTechDesc: 0
TechDesc:
NeedLockDesc: 0
@ -6684,7 +6684,7 @@ MonoBehaviour:
PlayerActionType: 0
AIParamType: 0
ActionName: 169
Desc:
Desc: 17229
NeedTechDesc: 0
TechDesc:
NeedLockDesc: 0
@ -6716,7 +6716,7 @@ MonoBehaviour:
PlayerActionType: 0
AIParamType: 0
ActionName: 173
Desc:
Desc: 17230
NeedTechDesc: 0
TechDesc:
NeedLockDesc: 0
@ -6748,7 +6748,7 @@ MonoBehaviour:
PlayerActionType: 0
AIParamType: 0
ActionName: 16670
Desc:
Desc: 17231
NeedTechDesc: 0
TechDesc:
NeedLockDesc: 0
@ -6780,7 +6780,7 @@ MonoBehaviour:
PlayerActionType: 0
AIParamType: 0
ActionName: 175
Desc:
Desc: 17232
NeedTechDesc: 0
TechDesc:
NeedLockDesc: 0
@ -6812,7 +6812,7 @@ MonoBehaviour:
PlayerActionType: 0
AIParamType: 0
ActionName: 190
Desc:
Desc: 17233
NeedTechDesc: 0
TechDesc:
NeedLockDesc: 0
@ -6844,7 +6844,7 @@ MonoBehaviour:
PlayerActionType: 0
AIParamType: 0
ActionName: 16668
Desc:
Desc: 17234
NeedTechDesc: 0
TechDesc:
NeedLockDesc: 0
@ -6876,7 +6876,7 @@ MonoBehaviour:
PlayerActionType: 0
AIParamType: 0
ActionName: 189
Desc:
Desc: 17235
NeedTechDesc: 0
TechDesc:
NeedLockDesc: 0
@ -6908,7 +6908,7 @@ MonoBehaviour:
PlayerActionType: 0
AIParamType: 0
ActionName: 186
Desc:
Desc: 17236
NeedTechDesc: 0
TechDesc:
NeedLockDesc: 0
@ -6940,7 +6940,7 @@ MonoBehaviour:
PlayerActionType: 0
AIParamType: 0
ActionName: 16669
Desc:
Desc: 17237
NeedTechDesc: 0
TechDesc:
NeedLockDesc: 0

2
Unity/Assets/Resources/Export/LibraryDataAssets.asset
View File

@ -16,7 +16,7 @@ MonoBehaviour:
- GiantType: 2
Name: 1044
Desc: 1110
Diag: 17127
Diag: 17238
EnglishName: REMILIA SCARLET
DiagColor: {r: 0.9176471, g: 0.34901962, b: 0.3529412, a: 1}
Illust: {fileID: 21300000, guid: d4661e5af1f33b94ea56ac7d7b30b512, type: 3}

120
Unity/Assets/Resources/Export/Multilingual.asset
View File

@ -173716,4 +173716,124 @@ MonoBehaviour:
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
- ID: 17227
ZH: "<color=yellow>[\u9A6C]\u804C\u9636\u82F1\u96C4</color>\u3002\u6B7B\u4EA1\u540E3\u56DE\u5408\u5185\u4E0D\u53EF\u518D\u6B21\u51FA\u6218\u3002"
TDZH:
EN:
JP:
KR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
- ID: 17228
ZH: "**<[\u738B]\u804C\u9636\u82F1\u96C4>**\u3002\u5168\u573A\u6700\u591A\u5B58\u5728\u4E00\u540D**<\u84EC\u83B1\u5C71\u8F89\u591C>**\u3002\u6B7B\u4EA1\u540E3\u56DE\u5408\u5185\u4E0D\u53EF\u518D\u6B21\u51FA\u6218\u3002"
TDZH:
EN:
JP:
KR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
- ID: 17229
ZH: "**<[\u540E]\u804C\u9636\u82F1\u96C4>**\u3002\u5168\u573A\u6700\u591A\u5B58\u5728\u4E00\u540D**<\u516B\u610F\u6C38\u7433>**\u3002\u6B7B\u4EA1\u540E3\u56DE\u5408\u5185\u4E0D\u53EF\u518D\u6B21\u51FA\u6218\u3002"
TDZH:
EN:
JP:
KR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
- ID: 17230
ZH: "**<[\u76F8]\u804C\u9636\u82F1\u96C4>**\u3002\u5168\u573A\u6700\u591A\u5B58\u5728\u4E00\u540D**<\u56E0\u5E61\u5E1D>**\u3002\u6B7B\u4EA1\u540E3\u56DE\u5408\u5185\u4E0D\u53EF\u518D\u6B21\u51FA\u6218\u3002"
TDZH:
EN:
JP:
KR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
- ID: 17231
ZH: "**<[\u9A6C]\u804C\u9636\u82F1\u96C4>**\u3002\u5168\u573A\u6700\u591A\u5B58\u5728\u4E00\u540D**<\u94C3\u4ED9\xB7\u4F18\u6619\u534E\u9662\xB7\u56E0\u5E61>**\u3002\u6B7B\u4EA1\u540E3\u56DE\u5408\u5185\u4E0D\u53EF\u518D\u6B21\u51FA\u6218\u3002"
TDZH:
EN:
JP:
KR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
- ID: 17232
ZH: "**<[\u8F66]\u804C\u9636\u82F1\u96C4>**\u3002\u5168\u573A\u6700\u591A\u5B58\u5728\u4E00\u540D**<\u85E4\u539F\u59B9\u7EA2>**\u3002\u6B7B\u4EA1\u540E3\u56DE\u5408\u5185\u4E0D\u53EF\u518D\u6B21\u51FA\u6218\u3002"
TDZH:
EN:
JP:
KR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
- ID: 17233
ZH: "**<[\u738B]\u804C\u9636\u82F1\u96C4>**\u3002\u5168\u573A\u6700\u591A\u5B58\u5728\u4E00\u540D**<\u516B\u5742\u795E\u5948\u5B50>**\u3002\u6B7B\u4EA1\u540E3\u56DE\u5408\u5185\u4E0D\u53EF\u518D\u6B21\u51FA\u6218\u3002"
TDZH:
EN:
JP:
KR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
- ID: 17234
ZH: "**<[\u540E]\u804C\u9636\u82F1\u96C4>**\u3002\u5168\u573A\u6700\u591A\u5B58\u5728\u4E00\u540D**<\u6D29\u77E2\u8BF9\u8BBF\u5B50>**\u3002\u6B7B\u4EA1\u540E3\u56DE\u5408\u5185\u4E0D\u53EF\u518D\u6B21\u51FA\u6218\u3002"
TDZH:
EN:
JP:
KR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
- ID: 17235
ZH: "**<[\u76F8]\u804C\u9636\u82F1\u96C4>**\u3002\u5168\u573A\u6700\u591A\u5B58\u5728\u4E00\u540D**<\u4E1C\u98CE\u8C37\u65E9\u82D7>**\u3002\u6B7B\u4EA1\u540E3\u56DE\u5408\u5185\u4E0D\u53EF\u518D\u6B21\u51FA\u6218\u3002"
TDZH:
EN:
JP:
KR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
- ID: 17236
ZH: "**<[\u9A6C]\u804C\u9636\u82F1\u96C4>**\u3002\u5168\u573A\u6700\u591A\u5B58\u5728\u4E00\u540D**<\u5C04\u547D\u4E38\u6587>**\u3002\u6B7B\u4EA1\u540E3\u56DE\u5408\u5185\u4E0D\u53EF\u518D\u6B21\u51FA\u6218\u3002"
TDZH:
EN:
JP:
KR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
- ID: 17237
ZH: "**<[\u8F66]\u804C\u9636\u82F1\u96C4>**\u3002\u5168\u573A\u6700\u591A\u5B58\u5728\u4E00\u540D**<\u72AC\u8D70\u691B>**\u3002\u6B7B\u4EA1\u540E3\u56DE\u5408\u5185\u4E0D\u53EF\u518D\u6B21\u51FA\u6218\u3002"
TDZH:
EN:
JP:
KR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
- ID: 17238
ZH: "\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"
TDZH:
EN:
JP:
KR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
TargetTypes: 0100000001000000010000000100000001000000

104
Unity/Assets/Resources/Prefab/UI/Outside/UIOutsideMenu.prefab
View File

@ -2657,44 +2657,28 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 2222896469180108794, guid: 7ef51c9dc8d0c5248942738961b531fe, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2222896469180108794, guid: 7ef51c9dc8d0c5248942738961b531fe, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2222896469180108794, guid: 7ef51c9dc8d0c5248942738961b531fe, type: 3}
propertyPath: m_SizeDelta.x
value: 256
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2222896469180108794, guid: 7ef51c9dc8d0c5248942738961b531fe, type: 3}
propertyPath: m_AnchoredPosition.x
value: 319.7648
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2222896469180108794, guid: 7ef51c9dc8d0c5248942738961b531fe, type: 3}
propertyPath: m_AnchoredPosition.y
value: -98.93
objectReference: {fileID: 0}
- target: {fileID: 2679028018220029159, guid: 7ef51c9dc8d0c5248942738961b531fe, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2679028018220029159, guid: 7ef51c9dc8d0c5248942738961b531fe, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2679028018220029159, guid: 7ef51c9dc8d0c5248942738961b531fe, type: 3}
propertyPath: m_SizeDelta.x
value: -17
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3451901859462160635, guid: 7ef51c9dc8d0c5248942738961b531fe, type: 3}
propertyPath: m_Name
value: UIOutsideMenuAboutPanel
objectReference: {fileID: 0}
- target: {fileID: 3451901859462160635, guid: 7ef51c9dc8d0c5248942738961b531fe, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4735088385716738539, guid: 7ef51c9dc8d0c5248942738961b531fe, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@ -2777,47 +2761,39 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5509163480483728840, guid: 7ef51c9dc8d0c5248942738961b531fe, type: 3}
propertyPath: m_AnchorMax.x
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5509163480483728840, guid: 7ef51c9dc8d0c5248942738961b531fe, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5509163480483728840, guid: 7ef51c9dc8d0c5248942738961b531fe, type: 3}
propertyPath: m_AnchorMin.y
value: 0.029751897
objectReference: {fileID: 0}
- target: {fileID: 6442713650346062183, guid: 7ef51c9dc8d0c5248942738961b531fe, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6442713650346062183, guid: 7ef51c9dc8d0c5248942738961b531fe, type: 3}
propertyPath: m_SizeDelta.x
value: -17
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6739967715622538133, guid: 7ef51c9dc8d0c5248942738961b531fe, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6739967715622538133, guid: 7ef51c9dc8d0c5248942738961b531fe, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6739967715622538133, guid: 7ef51c9dc8d0c5248942738961b531fe, type: 3}
propertyPath: m_SizeDelta.x
value: 130.8
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6739967715622538133, guid: 7ef51c9dc8d0c5248942738961b531fe, type: 3}
propertyPath: m_AnchoredPosition.x
value: 319.7648
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6739967715622538133, guid: 7ef51c9dc8d0c5248942738961b531fe, type: 3}
propertyPath: m_AnchoredPosition.y
value: -599.887
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6824926511242018314, guid: 7ef51c9dc8d0c5248942738961b531fe, type: 3}
propertyPath: m_SizeDelta.y
value: 616.904
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7994070186174196096, guid: 7ef51c9dc8d0c5248942738961b531fe, type: 3}
propertyPath: m_AnchorMax.y
@ -2833,7 +2809,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7994070186174196096, guid: 7ef51c9dc8d0c5248942738961b531fe, type: 3}
propertyPath: m_SizeDelta.y
value: 385.01
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7994070186174196096, guid: 7ef51c9dc8d0c5248942738961b531fe, type: 3}
propertyPath: m_AnchoredPosition.x
@ -2846,61 +2822,13 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 638888629593181178, guid: 7ef51c9dc8d0c5248942738961b531fe, type: 3}
insertIndex: -1
addedObject: {fileID: -5908845898632317959}
- targetCorrespondingSourceObject: {fileID: 5853184649331319079, guid: 7ef51c9dc8d0c5248942738961b531fe, type: 3}
insertIndex: -1
addedObject: {fileID: -5510145288981481408}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7ef51c9dc8d0c5248942738961b531fe, type: 3}
--- !u!1 &293597450826668512 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5853184649331319079, guid: 7ef51c9dc8d0c5248942738961b531fe, type: 3}
m_PrefabInstance: {fileID: 6136613255588772039}
m_PrefabAsset: {fileID: 0}
--- !u!114 &-5510145288981481408
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 293597450826668512}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
m_Name:
m_EditorClassIdentifier:
Ban: 0
ID: 17070
FontID: 0
TextCfg: []
--- !u!224 &1486127346949497132 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 4735088385716738539, guid: 7ef51c9dc8d0c5248942738961b531fe, type: 3}
m_PrefabInstance: {fileID: 6136613255588772039}
m_PrefabAsset: {fileID: 0}
--- !u!1 &6770151506938327869 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 638888629593181178, guid: 7ef51c9dc8d0c5248942738961b531fe, type: 3}
m_PrefabInstance: {fileID: 6136613255588772039}
m_PrefabAsset: {fileID: 0}
--- !u!114 &-5908845898632317959
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6770151506938327869}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
m_Name:
m_EditorClassIdentifier:
Ban: 0
ID: 17069
FontID: 0
TextCfg: []
--- !u!114 &7377197744426511123 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3695400844062659540, guid: 7ef51c9dc8d0c5248942738961b531fe, type: 3}

2
Unity/Assets/Resources/Prefab/UI/Outside/UIOutsideMenuAboutPanel.prefab
View File

@ -1628,7 +1628,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
m_Name:
m_EditorClassIdentifier:
Ban: 0
Ban: 1
ID: 17070
FontID: 0
TextCfg: []

2
Unity/Assets/Resources/Prefab/UI/Outside/UIOutsideMultiplayRoomMemberRow.prefab
View File

@ -1370,7 +1370,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
AvatarImage: {fileID: 7762177666811050190}
LeaderImage: {fileID: 2028509407625721253}
NameText: {fileID: 2875130741396939258}
NameText: {fileID: 6503687505537430979}
StatusText: {fileID: 9094648081951770890}
ForcesText: {fileID: 2875130741396939258}
ForcesButton: {fileID: 8612292243586636816}

6
Unity/Assets/Scripts/TH1_UI/Common/ButtonHoverEffect.cs
View File

@ -40,7 +40,8 @@ public class ButtonHoverEffect : MonoBehaviour, IPointerEnterHandler, IPointerEx
isPointerOver = true; // 标记指针进入
if (hoverSound != null)
{
audioSource.PlayOneShot(hoverSound);
AudioManager.Instance.PlayAudio("SFX/UI_buttonHover");
//audioSource.PlayOneShot(hoverSound);
}
else
AudioManager.Instance.PlayAudio("SFX/UI_buttonHover");
@ -60,7 +61,8 @@ public class ButtonHoverEffect : MonoBehaviour, IPointerEnterHandler, IPointerEx
// 播放点击音效
if (clickSound != null)
{
audioSource.PlayOneShot(clickSound);
AudioManager.Instance.PlayAudio("SFX/UI_buttonClick");
//audioSource.PlayOneShot(clickSound);
}
else
AudioManager.Instance.PlayAudio("SFX/UI_buttonClick");

6
Unity/Assets/Scripts/TH1_UI/View/Outside/UIOutsideMultiplayView.cs
View File

@ -421,7 +421,7 @@ namespace TH1_UI.View.Outside
if (isSameForce)
{
CantStartHint.SetActive(true);
CantStartHintText.text = Table.Instance.TextDataAssets.OutsideMultiplayCantStartForce;
CantStartHintText.text = MultilingualManager.Instance.GetMultilingualText(Table.Instance.TextDataAssets.OutsideMultiplayCantStartForce);
CantStartHintAnimancer.Play(ResourceCache.Instance.AnimCache.UICommonPanelFadeIn);
Timer.Instance.TimerRegister(this, () =>
{
@ -435,10 +435,10 @@ namespace TH1_UI.View.Outside
}
//Step #3 判断lobby人数 是否大于游戏玩家总数
int playerCount = (int)PlayerCount.SelectedIndex + 2;
if (members.Count < playerCount)
if (members.Count > playerCount)
{
CantStartHint.SetActive(true);
CantStartHintText.text = Table.Instance.TextDataAssets.OutsideMultiplayCantStartCount;
CantStartHintText.text = MultilingualManager.Instance.GetMultilingualText(Table.Instance.TextDataAssets.OutsideMultiplayCantStartCount);
CantStartHintAnimancer.Play(ResourceCache.Instance.AnimCache.UICommonPanelFadeIn);
Timer.Instance.TimerRegister(this, () =>
{