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

外交系统迭代

Browse Source
This commit is contained in:
kawagiri 2025-08-27 22:44:02 +08:00
parent d7fa9eba85
commit f36449654c
5 changed files with 314 additions and 234 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.

4
Unity/Assets/Resources/DataAssets/DiplomacyDataAssets.asset
View File

@ -82,7 +82,7 @@ MonoBehaviour:
FeelingStrategyColor: {r: 0, g: 1, b: 0, a: 0}
- FeelingStrategy: 4
FeelingStrategyTitle: "\u5F3A\u5927\u7684"
FeelingStrategyDesc: "\u5728\u5979\u4EEC\u7684\u89C6\u91CE\u5185\uFF0C\u60A8\u62E5\u6709\u66F4\u5F3A\u7684\u519B\u4E8B\u529B\u91CF"
FeelingStrategyDesc: "\u60A8\u62E5\u6709\u66F4\u5F3A\u7684\u519B\u4E8B\u529B\u91CF"
FeelingStrategyColor: {r: 0, g: 1, b: 0, a: 0}
- FeelingStrategy: 5
FeelingStrategyTitle: "\u52C7\u6562\u7684"
@ -98,7 +98,7 @@ MonoBehaviour:
FeelingStrategyColor: {r: 1, g: 0, b: 0, a: 0}
- FeelingStrategy: 8
FeelingStrategyTitle: "\u5F31\u5C0F\u7684"
FeelingStrategyDesc: "\u5728\u5979\u4EEC\u7684\u89C6\u91CE\u5185\uFF0C\u60A8\u62E5\u6709\u66F4\u5F31\u7684\u519B\u4E8B\u529B\u91CF"
FeelingStrategyDesc: "\u60A8\u62E5\u6709\u66F4\u5F31\u7684\u519B\u4E8B\u529B\u91CF"
FeelingStrategyColor: {r: 1, g: 0, b: 0, a: 0}
- FeelingStrategy: 9
FeelingStrategyTitle: "\u70E6\u4EBA\u7684"

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

File diff suppressed because one or more lines are too long

88
Unity/Assets/Resources/Prefab/unitPrefab.prefab
View File

@ -917,6 +917,81 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &4687404733610479417
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3235152742328579924}
- component: {fileID: 8721809657915940915}
- component: {fileID: 8813951885642489859}
m_Layer: 5
m_Name: Ally
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3235152742328579924
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4687404733610479417}
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: 4743678665050038577}
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: 0, y: 0}
m_SizeDelta: {x: 0.9, y: 0.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8721809657915940915
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4687404733610479417}
m_CullTransparentMesh: 1
--- !u!114 &8813951885642489859
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4687404733610479417}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: c8aba17a7b79944488e1164a36a2180f, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 100
--- !u!1 &4800135393041783816
GameObject:
m_ObjectHideFlags: 0
@ -1080,7 +1155,7 @@ GameObject:
- component: {fileID: 8506562970266540957}
- component: {fileID: 4682654857038033231}
m_Layer: 5
m_Name: BG
m_Name: AllyBG
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -1097,13 +1172,14 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Children:
- {fileID: 3235152742328579924}
m_Father: {fileID: 1774352506934932859}
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: -0.06225, y: -0.825}
m_SizeDelta: {x: 4.1245, y: 1.4611}
m_AnchoredPosition: {x: 1.9, y: -0.24}
m_SizeDelta: {x: 1, y: 1.4611}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8506562970266540957
CanvasRenderer:
@ -1133,9 +1209,9 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: d7e01567271607d448edba74314e7616, type: 3}
m_Sprite: {fileID: 21300000, guid: 37ae23071c996804a963cf76a2fe42de, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_PreserveAspect: 1
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1

9
Unity/Assets/Scripts/TH1_UI/View/Info/UIInfoDiplomacyView.cs
View File

@ -181,9 +181,12 @@ namespace TH1_UI.View.Info
btn.onClick.RemoveAllListeners();
btn.onClick.AddListener(() =>
{
//如果成功执行，关闭当前窗口
if (actLogic.CompleteExecute(actionParams, false))
closeButton.onClick.Invoke();
actLogic.CompleteExecute(actionParams, false);
//不用关闭窗口，因为执行成功后会通过事件通知这里来关闭
/*if ()
//如果成功执行，关闭当前窗口
closeButton.onClick.Invoke();*/
});
}
}