多语言bug
This commit is contained in:
parent
655f2b6b8c
commit
23c2a54bef
@ -1,5 +1,5 @@
|
||||
{
|
||||
"nextId": 183,
|
||||
"nextId": 184,
|
||||
"bugs": [
|
||||
{
|
||||
"id": 2,
|
||||
@ -1745,21 +1745,21 @@
|
||||
"id": 177,
|
||||
"title": "更新后存档丢失",
|
||||
"description": "",
|
||||
"status": "open",
|
||||
"status": "fixed",
|
||||
"priority": "medium",
|
||||
"module": "",
|
||||
"createdAt": 1778914230925,
|
||||
"updatedAt": 1778914230925
|
||||
"updatedAt": 1779014349250
|
||||
},
|
||||
{
|
||||
"id": 178,
|
||||
"title": "古明地帝国奇观局内文本描述缺失,版本0.71i",
|
||||
"description": "",
|
||||
"status": "open",
|
||||
"status": "fixed",
|
||||
"priority": "medium",
|
||||
"module": "",
|
||||
"createdAt": 1778919630925,
|
||||
"updatedAt": 1778919630925
|
||||
"updatedAt": 1779014354074
|
||||
},
|
||||
{
|
||||
"id": 179,
|
||||
@ -1775,11 +1775,11 @@
|
||||
"id": 180,
|
||||
"title": "投降之后还能继续",
|
||||
"description": "",
|
||||
"status": "open",
|
||||
"status": "fixed",
|
||||
"priority": "medium",
|
||||
"module": "",
|
||||
"createdAt": 1778936930614,
|
||||
"updatedAt": 1778936930614
|
||||
"updatedAt": 1779010489038
|
||||
},
|
||||
{
|
||||
"id": 181,
|
||||
@ -1800,6 +1800,16 @@
|
||||
"module": "",
|
||||
"createdAt": 1778945157523,
|
||||
"updatedAt": 1778945157523
|
||||
},
|
||||
{
|
||||
"id": 183,
|
||||
"title": "铃仙继承 再攻消耗问题",
|
||||
"description": "",
|
||||
"status": "fixed",
|
||||
"priority": "medium",
|
||||
"module": "",
|
||||
"createdAt": 1779010659607,
|
||||
"updatedAt": 1779011755203
|
||||
}
|
||||
]
|
||||
}
|
||||
Binary file not shown.
File diff suppressed because one or more lines are too long
@ -158,7 +158,7 @@ MonoBehaviour:
|
||||
IsActive: 1
|
||||
NotShow: 0
|
||||
Name: "\u6BCD\u6743\u4F20\u7EDF"
|
||||
Description: "\u53EF\u5728**<\u68EE\u6797>**\u4E2D\u5EFA\u9020**<\u540E\u4E4B\u96D5\u50CF>**"
|
||||
Description: "\u53EF\u5728**<![1]\u68EE\u6797>**\u4E2D\u5EFA\u9020**<![2]\u540E\u4E4B\u96D5\u50CF>**"
|
||||
Cost: 15
|
||||
Icon: {fileID: 0}
|
||||
IconViewSizeType: 0
|
||||
@ -245,7 +245,7 @@ MonoBehaviour:
|
||||
IsActive: 1
|
||||
NotShow: 0
|
||||
Name: "\u5185\u9601\u5236"
|
||||
Description: "\u53EF\u5728**<\u6D45\u6D77>**\u4E2D\u5EFA\u9020**<\u76F8\u4E4B\u96D5\u50CF>**"
|
||||
Description: "\u53EF\u5728**<![1]\u6D45\u6D77>**\u4E2D\u5EFA\u9020**<![2]\u76F8\u4E4B\u96D5\u50CF>**"
|
||||
Cost: 30
|
||||
Icon: {fileID: 0}
|
||||
IconViewSizeType: 0
|
||||
@ -332,7 +332,7 @@ MonoBehaviour:
|
||||
IsActive: 1
|
||||
NotShow: 0
|
||||
Name: "\u56FD\u5BB6\u8981\u585E"
|
||||
Description: "\u53EF\u5728**<\u5C71\u8109>**\u4E2D\u5EFA\u9020**<\u8F66\u4E4B\u96D5\u50CF>**"
|
||||
Description: "\u53EF\u5728**<![1]\u5C71\u8109>**\u4E2D\u5EFA\u9020**<![2]\u8F66\u4E4B\u96D5\u50CF>**"
|
||||
Cost: 30
|
||||
Icon: {fileID: 0}
|
||||
IconViewSizeType: 0
|
||||
@ -419,7 +419,7 @@ MonoBehaviour:
|
||||
IsActive: 1
|
||||
NotShow: 0
|
||||
Name: "\u541B\u6743\u795E\u6388"
|
||||
Description: "\u53EF\u5728**<\u6DF1\u6D77>**\u4E2D\u5EFA\u9020**<\u738B\u4E4B\u96D5\u50CF>**"
|
||||
Description: "\u53EF\u5728**<![1]\u6DF1\u6D77>**\u4E2D\u5EFA\u9020**<![2]\u738B\u4E4B\u96D5\u50CF>**"
|
||||
Cost: 60
|
||||
Icon: {fileID: 0}
|
||||
IconViewSizeType: 0
|
||||
@ -506,7 +506,7 @@ MonoBehaviour:
|
||||
IsActive: 1
|
||||
NotShow: 0
|
||||
Name: "\u6E38\u7267\u4F20\u7EDF"
|
||||
Description: "\u53EF\u5728**<\u5E73\u539F>**\u4E2D\u5EFA\u9020**<\u9A6C\u4E4B\u96D5\u50CF>**"
|
||||
Description: "\u53EF\u5728**<![1]\u5E73\u539F>**\u4E2D\u5EFA\u9020**<![2]\u9A6C\u4E4B\u96D5\u50CF>**"
|
||||
Cost: 60
|
||||
Icon: {fileID: 0}
|
||||
IconViewSizeType: 0
|
||||
|
||||
@ -54,7 +54,7 @@ MonoBehaviour:
|
||||
SpType: 0
|
||||
SkillList:
|
||||
SkillName:
|
||||
Desc: "\u5360\u98862\u5EA7\u6751\u5E84\u62161\u5EA7\u654C\u65B9\u57CE\u5E02(**<{param}/{param}>**)"
|
||||
Desc: "\u6211\u65B9\u5360\u98862\u5EA7\u6751\u5E84\u62161\u5EA7\u654C\u65B9\u57CE\u5E02(**<{param}/{param}>**)"
|
||||
UnitFullTypes: []
|
||||
TargetBuff:
|
||||
- taskContentType: 8
|
||||
@ -271,7 +271,7 @@ MonoBehaviour:
|
||||
SpType: 0
|
||||
SkillList:
|
||||
SkillName:
|
||||
Desc: "\u5360\u98862\u5EA7\u6751\u5E84\u62161\u5EA7\u654C\u65B9\u57CE\u5E02(**<{param}/{param}>**)"
|
||||
Desc: "\u6211\u65B9\u5360\u98862\u5EA7\u6751\u5E84\u62161\u5EA7\u654C\u65B9\u57CE\u5E02(**<{param}/{param}>**)"
|
||||
UnitFullTypes: []
|
||||
TargetBuff:
|
||||
- taskContentType: 2
|
||||
@ -450,7 +450,7 @@ MonoBehaviour:
|
||||
SpType: 0
|
||||
SkillList:
|
||||
SkillName:
|
||||
Desc: "\u5360\u98862\u5EA7\u6751\u5E84\u62161\u5EA7\u654C\u65B9\u57CE\u5E02(**<{param}/{param}>**)"
|
||||
Desc: "\u6211\u65B9\u5360\u98862\u5EA7\u6751\u5E84\u62161\u5EA7\u654C\u65B9\u57CE\u5E02(**<{param}/{param}>**)"
|
||||
UnitFullTypes: []
|
||||
TargetBuff:
|
||||
- taskContentType: 18
|
||||
@ -574,7 +574,7 @@ MonoBehaviour:
|
||||
SpType: 0
|
||||
SkillList:
|
||||
SkillName:
|
||||
Desc: "\u5360\u98862\u5EA7\u6751\u5E84\u62161\u5EA7\u654C\u65B9\u57CE\u5E02(**<{param}/{param}>**)"
|
||||
Desc: "\u6211\u65B9\u5360\u98862\u5EA7\u6751\u5E84\u62161\u5EA7\u654C\u65B9\u57CE\u5E02(**<{param}/{param}>**)"
|
||||
UnitFullTypes: []
|
||||
TargetBuff:
|
||||
- taskContentType: 2
|
||||
|
||||
@ -118,6 +118,22 @@ MonoBehaviour:
|
||||
Empire:
|
||||
Civ: 3
|
||||
Force: 3
|
||||
- Image: {fileID: 21300000, guid: 04f3b6ff4582db044a89f61913c44790, type: 3}
|
||||
Empire:
|
||||
Civ: 2
|
||||
Force: 2
|
||||
- Image: {fileID: 21300000, guid: ae82b9e47f750a646bb48bd01916a0e2, type: 3}
|
||||
Empire:
|
||||
Civ: 2
|
||||
Force: 2
|
||||
- Image: {fileID: 21300000, guid: b181d3c908bec4841bc2f58064edcf44, type: 3}
|
||||
Empire:
|
||||
Civ: 2
|
||||
Force: 2
|
||||
- Image: {fileID: 21300000, guid: 455f0e8ccd1cc88499cb72a4627bdb32, type: 3}
|
||||
Empire:
|
||||
Civ: 2
|
||||
Force: 2
|
||||
- MomentType: 3
|
||||
TitleBG: {r: 1, g: 0.21568628, b: 0.2784314, a: 1}
|
||||
DescBG: {r: 1, g: 1, b: 0.8745098, a: 1}
|
||||
|
||||
@ -45,7 +45,7 @@ MonoBehaviour:
|
||||
Name: BING
|
||||
Desc: "\u89D2\u8272\u7ACB\u7ED8"
|
||||
- Title: 3
|
||||
Name: "P\u541B"
|
||||
Name: "\u9165\u8106\u8FBE\u845B"
|
||||
Desc: "\u63D2\u56FE/\u5267\u60C5\u6F2B\u753B/\u573A\u666F/\u68CB\u5B50"
|
||||
- Title: 3
|
||||
Name: "\u5A07\u9633"
|
||||
|
||||
@ -158,7 +158,7 @@ MonoBehaviour:
|
||||
IsActive: 1
|
||||
NotShow: 0
|
||||
Name: 18126
|
||||
Description: 18128
|
||||
Description: 19884
|
||||
Cost: 15
|
||||
Icon: {fileID: 0}
|
||||
IconViewSizeType: 0
|
||||
@ -419,7 +419,7 @@ MonoBehaviour:
|
||||
IsActive: 1
|
||||
NotShow: 0
|
||||
Name: 18135
|
||||
Description: 18841
|
||||
Description: 19885
|
||||
Cost: 60
|
||||
Icon: {fileID: 0}
|
||||
IconViewSizeType: 0
|
||||
|
||||
@ -54,7 +54,7 @@ MonoBehaviour:
|
||||
SpType: 0
|
||||
SkillList:
|
||||
SkillName:
|
||||
Desc: 17325
|
||||
Desc: 19880
|
||||
UnitFullTypes: []
|
||||
TargetBuff:
|
||||
- taskContentType: 8
|
||||
@ -271,7 +271,7 @@ MonoBehaviour:
|
||||
SpType: 0
|
||||
SkillList:
|
||||
SkillName:
|
||||
Desc: 17325
|
||||
Desc: 19880
|
||||
UnitFullTypes: []
|
||||
TargetBuff:
|
||||
- taskContentType: 2
|
||||
@ -450,7 +450,7 @@ MonoBehaviour:
|
||||
SpType: 0
|
||||
SkillList:
|
||||
SkillName:
|
||||
Desc: 17325
|
||||
Desc: 19880
|
||||
UnitFullTypes: []
|
||||
TargetBuff:
|
||||
- taskContentType: 18
|
||||
@ -574,7 +574,7 @@ MonoBehaviour:
|
||||
SpType: 0
|
||||
SkillList:
|
||||
SkillName:
|
||||
Desc: 17325
|
||||
Desc: 19880
|
||||
UnitFullTypes: []
|
||||
TargetBuff:
|
||||
- taskContentType: 2
|
||||
|
||||
@ -118,6 +118,22 @@ MonoBehaviour:
|
||||
Empire:
|
||||
Civ: 3
|
||||
Force: 3
|
||||
- Image: {fileID: 21300000, guid: 04f3b6ff4582db044a89f61913c44790, type: 3}
|
||||
Empire:
|
||||
Civ: 2
|
||||
Force: 2
|
||||
- Image: {fileID: 21300000, guid: ae82b9e47f750a646bb48bd01916a0e2, type: 3}
|
||||
Empire:
|
||||
Civ: 2
|
||||
Force: 2
|
||||
- Image: {fileID: 21300000, guid: b181d3c908bec4841bc2f58064edcf44, type: 3}
|
||||
Empire:
|
||||
Civ: 2
|
||||
Force: 2
|
||||
- Image: {fileID: 21300000, guid: 455f0e8ccd1cc88499cb72a4627bdb32, type: 3}
|
||||
Empire:
|
||||
Civ: 2
|
||||
Force: 2
|
||||
- MomentType: 3
|
||||
TitleBG: {r: 1, g: 0.21568628, b: 0.2784314, a: 1}
|
||||
DescBG: {r: 1, g: 1, b: 0.8745098, a: 1}
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -45,7 +45,7 @@ MonoBehaviour:
|
||||
Name: 19789
|
||||
Desc: 19790
|
||||
- Title: 3
|
||||
Name: 19791
|
||||
Name: 19886
|
||||
Desc: 19792
|
||||
- Title: 3
|
||||
Name: 19793
|
||||
|
||||
@ -2449,6 +2449,7 @@ MonoBehaviour:
|
||||
Status: {fileID: 8434855009408166871}
|
||||
StateIcon: {fileID: 5235522855673676285}
|
||||
StateText: {fileID: 4279868989359726187}
|
||||
Title_Status: {fileID: 820826486070689428}
|
||||
AttitudeArea: {fileID: 1053755750006094144}
|
||||
AttitudeNoMeetText: {fileID: 986397334151331722}
|
||||
RelationHandle: {fileID: 8690818405471307305}
|
||||
@ -3958,9 +3959,9 @@ GameObject:
|
||||
m_Component:
|
||||
- component: {fileID: 8519523085376788737}
|
||||
- component: {fileID: 6260822222368216961}
|
||||
- component: {fileID: 8926112381304775168}
|
||||
- component: {fileID: 5838203675545632753}
|
||||
- component: {fileID: 811454154168339723}
|
||||
- component: {fileID: 1427240084513787962}
|
||||
m_Layer: 5
|
||||
m_Name: Title
|
||||
m_TagString: Untagged
|
||||
@ -3975,17 +3976,17 @@ RectTransform:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4954152614795277896}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4392374243529415332}
|
||||
m_Father: {fileID: 820826486070689428}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 258.8105, y: -37}
|
||||
m_SizeDelta: {x: 450.6963, y: 39.772995}
|
||||
m_AnchoredPosition: {x: 60.005, y: -19.886497}
|
||||
m_SizeDelta: {x: 120.01, y: 39.772995}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6260822222368216961
|
||||
CanvasRenderer:
|
||||
@ -3995,26 +3996,6 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4954152614795277896}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &8926112381304775168
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4954152614795277896}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreLayout: 1
|
||||
m_MinWidth: -1
|
||||
m_MinHeight: -1
|
||||
m_PreferredWidth: -1
|
||||
m_PreferredHeight: -1
|
||||
m_FlexibleWidth: -1
|
||||
m_FlexibleHeight: -1
|
||||
m_LayoutPriority: 1
|
||||
--- !u!114 &5838203675545632753
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -4134,6 +4115,20 @@ MonoBehaviour:
|
||||
LineSpacing: 0
|
||||
ApplyParagraphSpacing: 0
|
||||
ParagraphSpacing: 0
|
||||
--- !u!114 &1427240084513787962
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4954152614795277896}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 2
|
||||
m_VerticalFit: 0
|
||||
--- !u!1 &5099121202833536075
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -7262,6 +7257,70 @@ MonoBehaviour:
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &8060166878586691777
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 820826486070689428}
|
||||
- component: {fileID: 9003296172553167754}
|
||||
m_Layer: 5
|
||||
m_Name: Title_Status
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &820826486070689428
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8060166878586691777}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 8519523085376788737}
|
||||
- {fileID: 1422499624616113614}
|
||||
m_Father: {fileID: 4392374243529415332}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -74.26453, y: -8.325399}
|
||||
m_SizeDelta: {x: 450.6963, y: 39.772995}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &9003296172553167754
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8060166878586691777}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 0
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 3
|
||||
m_Spacing: 0
|
||||
m_ChildForceExpandWidth: 0
|
||||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 0
|
||||
m_ChildScaleWidth: 0
|
||||
m_ChildScaleHeight: 0
|
||||
m_ReverseArrangement: 0
|
||||
--- !u!1 &8061248717199797505
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -7450,8 +7509,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 0.99992007, y: 0.99992007, z: 0.99992007}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1422499624616113614}
|
||||
- {fileID: 8519523085376788737}
|
||||
- {fileID: 820826486070689428}
|
||||
- {fileID: 2111761568074629137}
|
||||
m_Father: {fileID: 6853086897893957772}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@ -7872,7 +7930,7 @@ RectTransform:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8434855009408166871}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
@ -7880,11 +7938,11 @@ RectTransform:
|
||||
- {fileID: 1369065720441892723}
|
||||
- {fileID: 3122934982860673879}
|
||||
- {fileID: 6757960264300857321}
|
||||
m_Father: {fileID: 4392374243529415332}
|
||||
m_Father: {fileID: 820826486070689428}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -129.8, y: -9.125399}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 90.37092, y: 33.2372}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &8682303587826302101
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 105 KiB |
@ -0,0 +1,114 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 04f3b6ff4582db044a89f61913c44790
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
flipGreenChannel: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMipmapLimit: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 124 KiB |
@ -0,0 +1,114 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ae82b9e47f750a646bb48bd01916a0e2
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
flipGreenChannel: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMipmapLimit: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 144 KiB |
@ -0,0 +1,114 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b181d3c908bec4841bc2f58064edcf44
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
flipGreenChannel: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMipmapLimit: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 93 KiB |
@ -0,0 +1,114 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 455f0e8ccd1cc88499cb72a4627bdb32
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
flipGreenChannel: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMipmapLimit: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -5110,8 +5110,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -235.0047, y: -132.19193}
|
||||
m_SizeDelta: {x: 3839.9998, y: 1644.375}
|
||||
m_AnchoredPosition: {x: -94, y: -0.000045776}
|
||||
m_SizeDelta: {x: 5502.42, y: 2364.32}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &662942485
|
||||
MonoBehaviour:
|
||||
|
||||
@ -332,7 +332,7 @@ namespace TH1_Logic.Config
|
||||
_audioVolume = 0.5f;
|
||||
_showReminder = true;
|
||||
_keyMomentEnabled = true;
|
||||
_bgmContinuousPlay = false;
|
||||
_bgmContinuousPlay = true;
|
||||
_secondaryLanguage = MultilingualType.EN;
|
||||
_modLanguageConfigs = new List<ModLanguageConfig>();
|
||||
// 全新存档不需要迁移(迁移仅针对老版本"全自动 apply"过的玩家)
|
||||
|
||||
@ -60,6 +60,12 @@ namespace Logic.Skill
|
||||
|
||||
public override void OnMove(UnitData self, GridData grid, MapData mapData, MoveType moveType, List<Vector2Int> path = null)
|
||||
{
|
||||
// 仅玩家主动指挥的移动才消耗"每回合首次移动"额度并尝试进入 HideState。
|
||||
// 被动位移(PassiveMove/AttackMove/SkillMove/PatrolMove/PushMove)一律跳过,
|
||||
// 既不翻转 _hasMovedThisTurn,也不附加 HideState。
|
||||
if (moveType != MoveType.ActiveMove)
|
||||
return;
|
||||
|
||||
if (_hasMovedThisTurn)
|
||||
return;
|
||||
|
||||
|
||||
@ -122,7 +122,9 @@ namespace Logic.Skill
|
||||
map.GridMap.GetAroundGridData(1, 1, grid, aroundBuf);
|
||||
foreach (var around in aroundBuf)
|
||||
{
|
||||
if (!around.RealUnit(map, out var target)) continue;
|
||||
// 跳过已死/半死态单位:避免在死亡链中爆炸回弹到尚未完成 SetUnitDataDie 的源头
|
||||
// (否则会对"死亡替换"类技能如 ScarletKoakuma 造成重复触发,生成多个替换单位)
|
||||
if (!around.RealUnit(map, out var target) || !target.IsAlive()) continue;
|
||||
|
||||
if (target.Id != self.Id && !target.GetSkill(SkillType.KomeijiFearImmune, out _))
|
||||
{
|
||||
@ -254,7 +256,8 @@ namespace Logic.Skill
|
||||
map.GridMap.GetAroundGridData(1, 1, grid, aroundBuf);
|
||||
foreach (var around in aroundBuf)
|
||||
{
|
||||
if (!around.RealUnit(map, out var target)) continue;
|
||||
// 跳过已死/半死态单位:与上方 2 层爆炸分支保持一致,避免在死亡链中传播到已死单位
|
||||
if (!around.RealUnit(map, out var target) || !target.IsAlive()) continue;
|
||||
|
||||
if (target.Id != self.Id && !target.GetSkill(SkillType.KomeijiFearImmune, out _))
|
||||
{
|
||||
|
||||
@ -130,6 +130,9 @@ public class CameraController : MonoBehaviour
|
||||
|
||||
void HandleZoom()
|
||||
{
|
||||
// 鼠标不在地图可交互区域时不响应滚轮缩放;ShouldBlockDrag 兜住正在拖动地图、鼠标暂时滑到UI上的情况
|
||||
if (!UIBlockCameraDrag.IsPointerOnUI && !UIBlockCameraDrag.ShouldBlockDrag) return;
|
||||
|
||||
// 获取滚轮输入
|
||||
float scroll = Input.GetAxis("Mouse ScrollWheel");
|
||||
if (scroll != 0f)
|
||||
|
||||
@ -40,6 +40,7 @@ namespace TH1_UI.View.Info
|
||||
public GameObject Status;
|
||||
public Image StateIcon;
|
||||
public TextMeshProUGUI StateText;
|
||||
public RectTransform Title_Status;
|
||||
|
||||
//态度条
|
||||
public GameObject AttitudeArea;
|
||||
@ -124,7 +125,9 @@ namespace TH1_UI.View.Info
|
||||
//Step #6 设置BGM
|
||||
AudioManager.Instance.PlayMusic(info.MusicName,1f,2f,true);
|
||||
|
||||
//Step #7 重新排布
|
||||
//Step #7 重新排布:子元素先 rebuild,父容器 VerticalGroup 再整体 rebuild
|
||||
if (Title_Status != null)
|
||||
LayoutRebuilder.ForceRebuildLayoutImmediate(Title_Status);
|
||||
LayoutRebuilder.ForceRebuildLayoutImmediate(VerticalGroup);
|
||||
}
|
||||
|
||||
|
||||
@ -295,12 +295,11 @@ namespace TH1_UI.View.Info
|
||||
//如果是奇观
|
||||
if (grid.Resource == ResourceType.Wonder)
|
||||
{
|
||||
|
||||
|
||||
if (Table.Instance.GridAndResourceDataAssets.GetWonderInfo(grid.Wonder, out var info))
|
||||
// Name / Desc 走 LibraryDataAssets(图鉴文案),其他奇观信息仍由 WonderInfo 提供
|
||||
if (Table.Instance.LibraryDataAssets.GetLibraryInfoByWonder(grid.Wonder, out var libraryData))
|
||||
{
|
||||
title_DECODE = MultilingualManager.Instance.GetMultilingualTextSafe(info.Name);
|
||||
desc_DECODE = MultilingualManager.Instance.GetMultilingualTextSafe(info.Desc);
|
||||
title_DECODE = MultilingualManager.Instance.GetMultilingualTextSafe(libraryData.Name);
|
||||
desc_DECODE = MultilingualManager.Instance.GetMultilingualTextSafe(libraryData.Desc);
|
||||
}
|
||||
}
|
||||
//如果显示建筑或者资源
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user