prefab导出多语言迭代
This commit is contained in:
parent
b773abeed6
commit
d7fa9eba85
Binary file not shown.
File diff suppressed because one or more lines are too long
@ -1717,10 +1717,11 @@ MonoBehaviour:
|
||||
DiplomacyBaseInfo: {fileID: 2346096541604194801}
|
||||
ActionArea: {fileID: 1602262009084493556}
|
||||
NoMeetText: {fileID: 6623925848885411558}
|
||||
RelationSubArea: {fileID: 6719303612942898519}
|
||||
RelationText: {fileID: 8165877537025501972}
|
||||
RelationBar: {fileID: 7325536663217747}
|
||||
RelationHandle: {fileID: 87178625905760550}
|
||||
RelationHintText: {fileID: 0}
|
||||
RelationHintText: {fileID: 6390497550116288730}
|
||||
BubbleChat: {fileID: 6047651367882887697}
|
||||
BubbleChatText: {fileID: 2617465551149939853}
|
||||
ActionList:
|
||||
|
||||
@ -15994,9 +15994,6 @@ PrefabInstance:
|
||||
- targetCorrespondingSourceObject: {fileID: 7763630946422454447, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 122265654}
|
||||
- targetCorrespondingSourceObject: {fileID: 1314771010785267260, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1718239607}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
--- !u!224 &122265652 stripped
|
||||
RectTransform:
|
||||
@ -20812,39 +20809,6 @@ MonoBehaviour:
|
||||
WordSpacing: 0
|
||||
LineSpacing: -30
|
||||
ParagraphSpacing: 0
|
||||
--- !u!1 &160159227 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1314771010785267260, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
m_PrefabInstance: {fileID: 1244394151}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &160159231
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 160159227}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 111
|
||||
FontID: 3
|
||||
TextCfg:
|
||||
- Type: 0
|
||||
FontSize: 95
|
||||
CharacterSpacing: 10
|
||||
WordSpacing: 0
|
||||
LineSpacing: 0
|
||||
ParagraphSpacing: 0
|
||||
- Type: 1
|
||||
FontSize: 72
|
||||
CharacterSpacing: 10
|
||||
WordSpacing: 0
|
||||
LineSpacing: 0
|
||||
ParagraphSpacing: 0
|
||||
--- !u!1 &160676531
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -22047,39 +22011,6 @@ RectTransform:
|
||||
m_AnchoredPosition: {x: 2, y: -13}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &172089344 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1314771010785267260, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
m_PrefabInstance: {fileID: 4136842294473716466}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &172089348
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 172089344}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 110
|
||||
FontID: 3
|
||||
TextCfg:
|
||||
- Type: 0
|
||||
FontSize: 95
|
||||
CharacterSpacing: 10
|
||||
WordSpacing: 0
|
||||
LineSpacing: 0
|
||||
ParagraphSpacing: 0
|
||||
- Type: 1
|
||||
FontSize: 72
|
||||
CharacterSpacing: 10
|
||||
WordSpacing: 0
|
||||
LineSpacing: 0
|
||||
ParagraphSpacing: 0
|
||||
--- !u!1 &177691647
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -67459,39 +67390,6 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 506755352}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &507880768 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1314771010785267260, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
m_PrefabInstance: {fileID: 1467393258}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &507880772
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 507880768}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 113
|
||||
FontID: 3
|
||||
TextCfg:
|
||||
- Type: 0
|
||||
FontSize: 95
|
||||
CharacterSpacing: 10
|
||||
WordSpacing: 0
|
||||
LineSpacing: 0
|
||||
ParagraphSpacing: 0
|
||||
- Type: 1
|
||||
FontSize: 72
|
||||
CharacterSpacing: 10
|
||||
WordSpacing: 0
|
||||
LineSpacing: 0
|
||||
ParagraphSpacing: 0
|
||||
--- !u!1 &509066659
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -153273,7 +153171,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1082107953
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -176191,9 +176089,6 @@ PrefabInstance:
|
||||
- targetCorrespondingSourceObject: {fileID: 7763630946422454447, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1244394154}
|
||||
- targetCorrespondingSourceObject: {fileID: 1314771010785267260, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 160159231}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
--- !u!224 &1244394152 stripped
|
||||
RectTransform:
|
||||
@ -205804,9 +205699,6 @@ PrefabInstance:
|
||||
- targetCorrespondingSourceObject: {fileID: 7763630946422454447, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1467393261}
|
||||
- targetCorrespondingSourceObject: {fileID: 1314771010785267260, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 507880772}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
--- !u!224 &1467393259 stripped
|
||||
RectTransform:
|
||||
@ -234690,45 +234582,6 @@ MonoBehaviour:
|
||||
WordSpacing: 0
|
||||
LineSpacing: 0
|
||||
ParagraphSpacing: 0
|
||||
--- !u!1 &1672324880 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1314771010785267260, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
m_PrefabInstance: {fileID: 1677662079}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1672324884
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1672324880}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 114
|
||||
FontID: 3
|
||||
TextCfg:
|
||||
- Type: 0
|
||||
FontSize: 95
|
||||
CharacterSpacing: 10
|
||||
WordSpacing: 0
|
||||
LineSpacing: 0
|
||||
ParagraphSpacing: 0
|
||||
- Type: 2
|
||||
FontSize: 60
|
||||
CharacterSpacing: 10
|
||||
WordSpacing: 0
|
||||
LineSpacing: 0
|
||||
ParagraphSpacing: 0
|
||||
- Type: 1
|
||||
FontSize: 72
|
||||
CharacterSpacing: 10
|
||||
WordSpacing: 0
|
||||
LineSpacing: 0
|
||||
ParagraphSpacing: 0
|
||||
--- !u!1 &1676258169
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -235337,9 +235190,6 @@ PrefabInstance:
|
||||
- targetCorrespondingSourceObject: {fileID: 7763630946422454447, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1677662082}
|
||||
- targetCorrespondingSourceObject: {fileID: 1314771010785267260, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1672324884}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
--- !u!224 &1677662080 stripped
|
||||
RectTransform:
|
||||
@ -240340,39 +240190,6 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1718144292}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1718239603 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1314771010785267260, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
m_PrefabInstance: {fileID: 122265651}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1718239607
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1718239603}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 112
|
||||
FontID: 3
|
||||
TextCfg:
|
||||
- Type: 0
|
||||
FontSize: 95
|
||||
CharacterSpacing: 10
|
||||
WordSpacing: 0
|
||||
LineSpacing: 0
|
||||
ParagraphSpacing: 0
|
||||
- Type: 1
|
||||
FontSize: 72
|
||||
CharacterSpacing: 10
|
||||
WordSpacing: 0
|
||||
LineSpacing: 0
|
||||
ParagraphSpacing: 0
|
||||
--- !u!1 &1718867970
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -300584,9 +300401,6 @@ PrefabInstance:
|
||||
- targetCorrespondingSourceObject: {fileID: 7763630946422454447, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1695505477}
|
||||
- targetCorrespondingSourceObject: {fileID: 1314771010785267260, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 172089348}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3}
|
||||
--- !u!114 &5522046704728294241
|
||||
MonoBehaviour:
|
||||
|
||||
@ -814,9 +814,9 @@ namespace Logic.Action
|
||||
// 完整的执行调用, 供外部使用
|
||||
public virtual bool CompleteExecute(CommonActionParams actionParams, bool isMoment)
|
||||
{
|
||||
Execute(actionParams, isMoment);
|
||||
var ret = Execute(actionParams, isMoment);
|
||||
AfterExecute(actionParams, isMoment);
|
||||
return false;
|
||||
return ret;
|
||||
}
|
||||
|
||||
// 实际的执行逻辑
|
||||
@ -1024,6 +1024,7 @@ namespace Logic.Action
|
||||
//消除水果
|
||||
actionParams.GridData.Resource = ResourceType.None;
|
||||
actionParams.GridData.RenderMark = true;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@ -28,6 +28,7 @@ namespace TH1_UI.View.Info
|
||||
|
||||
|
||||
public TextMeshProUGUI NoMeetText;
|
||||
public GameObject RelationSubArea;
|
||||
public TextMeshProUGUI RelationText;
|
||||
public GameObject RelationBar;
|
||||
public RectTransform RelationHandle;
|
||||
@ -89,16 +90,14 @@ namespace TH1_UI.View.Info
|
||||
if (dipInfo.DiplomacyState == DiplomacyState.NoDiplomacy)
|
||||
{
|
||||
NoMeetText.gameObject.SetActive(true);
|
||||
RelationBar.SetActive(false);
|
||||
RelationText.gameObject.SetActive(false);
|
||||
RelationSubArea.SetActive(false);
|
||||
|
||||
}
|
||||
//如果对方已经发现了我们
|
||||
else
|
||||
{
|
||||
NoMeetText.gameObject.SetActive(false);
|
||||
RelationText.gameObject.SetActive(true);
|
||||
RelationBar.SetActive(true);
|
||||
RelationSubArea.SetActive(true);
|
||||
MultilingualManager.Instance.SetUIText(RelationText,feelingInfo.feelingText);
|
||||
RelationText.color = feelingInfo.feelingColor;
|
||||
RelationHandle.anchoredPosition = new Vector2(Mathf.Lerp(-330f, -30f, dipInfo.FeelingValue/100f),RelationHandle.anchoredPosition.y);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user