Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1 into main
This commit is contained in:
commit
0868e50034
BIN
Tools/Multilingual.xlsx
Normal file
BIN
Tools/Multilingual.xlsx
Normal file
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
@ -20,6 +20,8 @@ MonoBehaviour:
|
||||
LeaderName: 36
|
||||
LeaderIllustration: {fileID: 21300000, guid: d4661e5af1f33b94ea56ac7d7b30b512, type: 3}
|
||||
LeaderAvatar: {fileID: 21300000, guid: 41539b2994045fb4897fa63698c04912, type: 3}
|
||||
WinPic: {fileID: 0}
|
||||
LosePic: {fileID: 0}
|
||||
PopulationSprite: {fileID: 21300000, guid: 3754071631085024cb3c23a0e374a7cb, type: 3}
|
||||
TechPool: 000000000100000002000000030000000400000005000000060000000700000028000000090000000a0000000b0000002c0000000d0000000e0000000f0000001000000011000000120000001300000014000000150000002a000000170000001800000019000000
|
||||
TechStart: 0000000028000000
|
||||
@ -51,6 +53,8 @@ MonoBehaviour:
|
||||
LeaderName: 171
|
||||
LeaderIllustration: {fileID: 21300000, guid: e1ef5c5c40488ae40bbd2ed4cf35b89e, type: 3}
|
||||
LeaderAvatar: {fileID: 21300000, guid: bbd7632369029b446ba7c3511796d4ef, type: 3}
|
||||
WinPic: {fileID: 0}
|
||||
LosePic: {fileID: 0}
|
||||
PopulationSprite: {fileID: 21300000, guid: 34d4466f228db71468e4b219ae135625, type: 3}
|
||||
TechPool: 00000000010000000200000003000000040000000500000006000000070000000800000026000000090000000b0000000c0000000d00000025000000240000001f000000220000002000000023000000210000001500000016000000170000001800000019000000
|
||||
TechStart: 000000001f000000
|
||||
@ -84,6 +88,8 @@ MonoBehaviour:
|
||||
LeaderName: 190
|
||||
LeaderIllustration: {fileID: 21300000, guid: 7b419554ffed25f4fa94a867715388e6, type: 3}
|
||||
LeaderAvatar: {fileID: 21300000, guid: 06c171d81e9c5654e91ee63782215264, type: 3}
|
||||
WinPic: {fileID: 0}
|
||||
LosePic: {fileID: 0}
|
||||
PopulationSprite: {fileID: 0}
|
||||
TechPool: 000000002d0000002e0000002f0000003000000031000000060000000700000008000000090000000a000000320000003300000034000000350000003600000010000000110000001200000013000000140000001500000016000000170000001800000037000000
|
||||
TechStart: 000000002d000000
|
||||
@ -124,6 +130,8 @@ MonoBehaviour:
|
||||
LeaderName: 94
|
||||
LeaderIllustration: {fileID: 21300000, guid: c31b7225b784dca488b6376ef5fe77d5, type: 3}
|
||||
LeaderAvatar: {fileID: 21300000, guid: 37c2125556ffd33438be7d85d95d1947, type: 3}
|
||||
WinPic: {fileID: 0}
|
||||
LosePic: {fileID: 0}
|
||||
PopulationSprite: {fileID: 0}
|
||||
TechPool: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f00000010000000110000001200000013000000140000001500000016000000170000001800000019000000
|
||||
TechStart: 0000000012000000
|
||||
@ -151,6 +159,8 @@ MonoBehaviour:
|
||||
LeaderName: 476
|
||||
LeaderIllustration: {fileID: 21300000, guid: 1b95776d20b35034682cec20dd8fd2e2, type: 3}
|
||||
LeaderAvatar: {fileID: 21300000, guid: 410ea7960b94c344b9e977cc6ce48506, type: 3}
|
||||
WinPic: {fileID: 0}
|
||||
LosePic: {fileID: 0}
|
||||
PopulationSprite: {fileID: 0}
|
||||
TechPool: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f00000010000000110000001200000013000000140000001500000016000000170000001800000019000000
|
||||
TechStart: 0000000015000000
|
||||
@ -179,6 +189,8 @@ MonoBehaviour:
|
||||
LeaderName: 478
|
||||
LeaderIllustration: {fileID: 21300000, guid: fb3779b9c26ca8b4fbdf4926b70567b0, type: 3}
|
||||
LeaderAvatar: {fileID: 21300000, guid: 97a1cd5a837d3e84f9adca403b2b4ee7, type: 3}
|
||||
WinPic: {fileID: 0}
|
||||
LosePic: {fileID: 0}
|
||||
PopulationSprite: {fileID: 0}
|
||||
TechPool: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f00000010000000110000001200000013000000140000001500000016000000170000001800000019000000
|
||||
TechStart: 0000000012000000
|
||||
@ -212,6 +224,8 @@ MonoBehaviour:
|
||||
LeaderName: 480
|
||||
LeaderIllustration: {fileID: 21300000, guid: 5249c10ddd2faaf4cb799d1e53191a4b, type: 3}
|
||||
LeaderAvatar: {fileID: 21300000, guid: 48b938f7b519b294bac8b6ae81249bcb, type: 3}
|
||||
WinPic: {fileID: 0}
|
||||
LosePic: {fileID: 0}
|
||||
PopulationSprite: {fileID: 0}
|
||||
TechPool: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f00000010000000110000001200000013000000140000001500000016000000170000001800000019000000
|
||||
TechStart: 0000000005000000
|
||||
@ -242,6 +256,8 @@ MonoBehaviour:
|
||||
LeaderName: 482
|
||||
LeaderIllustration: {fileID: 21300000, guid: d3cd7a4b168e60c4e91fd4abf02ebd9d, type: 3}
|
||||
LeaderAvatar: {fileID: 21300000, guid: 18aa3c46d044a164bad99019576dc349, type: 3}
|
||||
WinPic: {fileID: 0}
|
||||
LosePic: {fileID: 0}
|
||||
PopulationSprite: {fileID: 0}
|
||||
TechPool: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f00000010000000110000001200000013000000140000001500000016000000170000001800000019000000
|
||||
TechStart: 0000000013000000
|
||||
|
||||
@ -924,7 +924,7 @@ MonoBehaviour:
|
||||
GiantCivId: 0
|
||||
GiantForceId: 0
|
||||
Name: 1924
|
||||
Desc:
|
||||
Desc: 17293
|
||||
LandType: 1
|
||||
NoMaxHealth: 0
|
||||
MaxHealth: 10
|
||||
|
||||
@ -1114,8 +1114,8 @@ MonoBehaviour:
|
||||
m_Calls: []
|
||||
m_text: "\u5DF4\u9ECELv.4"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: ca3ea612c29dc5f49a32dffc195e45fe, type: 2}
|
||||
m_sharedMaterial: {fileID: -8836383360333263746, guid: ca3ea612c29dc5f49a32dffc195e45fe, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: ce4904f8ddac15944907907115531ad5, type: 2}
|
||||
m_sharedMaterial: {fileID: 1214840240034325189, guid: ce4904f8ddac15944907907115531ad5, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
@ -1273,8 +1273,8 @@ MonoBehaviour:
|
||||
m_Calls: []
|
||||
m_text: "\u5DF4\u9ECELv.4"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: ca3ea612c29dc5f49a32dffc195e45fe, type: 2}
|
||||
m_sharedMaterial: {fileID: -8836383360333263746, guid: ca3ea612c29dc5f49a32dffc195e45fe, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: ce4904f8ddac15944907907115531ad5, type: 2}
|
||||
m_sharedMaterial: {fileID: 1214840240034325189, guid: ce4904f8ddac15944907907115531ad5, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
@ -1752,7 +1752,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &4277849009295623909
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1769,10 +1769,10 @@ RectTransform:
|
||||
- {fileID: 6260781005558013098}
|
||||
m_Father: {fileID: 4021679524593270616}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 280.093}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 250, y: -340.0465}
|
||||
m_SizeDelta: {x: 500, y: 280.093}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &2717569190816536331
|
||||
GameObject:
|
||||
@ -3797,7 +3797,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8390724778731580981
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -3822,8 +3822,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 250, y: -550.093}
|
||||
m_SizeDelta: {x: 500, y: 140}
|
||||
m_AnchoredPosition: {x: 250, y: -270}
|
||||
m_SizeDelta: {x: 500, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &4676610239985244751
|
||||
MonoBehaviour:
|
||||
@ -4324,7 +4324,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 250, y: -645.093}
|
||||
m_AnchoredPosition: {x: 250, y: -505}
|
||||
m_SizeDelta: {x: 500, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1555931548957767936
|
||||
@ -4618,8 +4618,8 @@ MonoBehaviour:
|
||||
m_Calls: []
|
||||
m_text: "\u8FD9\u662F\u4E00\u5EA7\u5386\u53F2\u60A0\u4E45\u7684\u7F8E\u4E3D\u57CE\u5E02\u3002"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: f74d73acde897024090a352531df919f, type: 2}
|
||||
m_sharedMaterial: {fileID: -5194638153132371293, guid: f74d73acde897024090a352531df919f, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: 8e119f168f1a6b745be02ef19f51610f, type: 2}
|
||||
m_sharedMaterial: {fileID: -8081454072124122709, guid: 8e119f168f1a6b745be02ef19f51610f, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
@ -4777,8 +4777,8 @@ MonoBehaviour:
|
||||
m_Calls: []
|
||||
m_text: "\u8FD9\u662F\u4E00\u5EA7\u5386\u53F2\u60A0\u4E45\u7684\u7F8E\u4E3D\u57CE\u5E02\u3002"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: f74d73acde897024090a352531df919f, type: 2}
|
||||
m_sharedMaterial: {fileID: -5194638153132371293, guid: f74d73acde897024090a352531df919f, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: 8e119f168f1a6b745be02ef19f51610f, type: 2}
|
||||
m_sharedMaterial: {fileID: -8081454072124122709, guid: 8e119f168f1a6b745be02ef19f51610f, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
@ -6157,8 +6157,8 @@ MonoBehaviour:
|
||||
m_Calls: []
|
||||
m_text: "\u5730\u7406"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: f74d73acde897024090a352531df919f, type: 2}
|
||||
m_sharedMaterial: {fileID: -5194638153132371293, guid: f74d73acde897024090a352531df919f, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: 8e119f168f1a6b745be02ef19f51610f, type: 2}
|
||||
m_sharedMaterial: {fileID: -8081454072124122709, guid: 8e119f168f1a6b745be02ef19f51610f, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
@ -6457,6 +6457,10 @@ PrefabInstance:
|
||||
propertyPath: m_fontSize
|
||||
value: 19
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1474592839158475786, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_hasFontAssetChanged
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2815703801643214741, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: PopulationItemInfo
|
||||
@ -6472,11 +6476,11 @@ PrefabInstance:
|
||||
- target: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_fontAsset
|
||||
value:
|
||||
objectReference: {fileID: 11400000, guid: f74d73acde897024090a352531df919f, type: 2}
|
||||
objectReference: {fileID: 11400000, guid: 8e119f168f1a6b745be02ef19f51610f, type: 2}
|
||||
- target: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_sharedMaterial
|
||||
value:
|
||||
objectReference: {fileID: -5194638153132371293, guid: f74d73acde897024090a352531df919f, type: 2}
|
||||
objectReference: {fileID: -8081454072124122709, guid: 8e119f168f1a6b745be02ef19f51610f, type: 2}
|
||||
- target: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_hasFontAssetChanged
|
||||
value: 0
|
||||
@ -6656,7 +6660,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
@ -6664,7 +6668,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
@ -6704,11 +6708,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 60
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -110
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
@ -6945,6 +6949,10 @@ PrefabInstance:
|
||||
propertyPath: m_fontSize
|
||||
value: 19
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1474592839158475786, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_hasFontAssetChanged
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2815703801643214741, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: TechItemInfo
|
||||
@ -6960,11 +6968,11 @@ PrefabInstance:
|
||||
- target: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_fontAsset
|
||||
value:
|
||||
objectReference: {fileID: 11400000, guid: f74d73acde897024090a352531df919f, type: 2}
|
||||
objectReference: {fileID: 11400000, guid: 8e119f168f1a6b745be02ef19f51610f, type: 2}
|
||||
- target: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_sharedMaterial
|
||||
value:
|
||||
objectReference: {fileID: -5194638153132371293, guid: f74d73acde897024090a352531df919f, type: 2}
|
||||
objectReference: {fileID: -8081454072124122709, guid: 8e119f168f1a6b745be02ef19f51610f, type: 2}
|
||||
- target: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_hasFontAssetChanged
|
||||
value: 0
|
||||
@ -7451,7 +7459,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
@ -7459,7 +7467,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
@ -7499,11 +7507,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 180
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -40
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
@ -7736,6 +7744,10 @@ PrefabInstance:
|
||||
propertyPath: m_fontSize
|
||||
value: 19
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1474592839158475786, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_hasFontAssetChanged
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2815703801643214741, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: BuildingItemInfo
|
||||
@ -7751,11 +7763,11 @@ PrefabInstance:
|
||||
- target: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_fontAsset
|
||||
value:
|
||||
objectReference: {fileID: 11400000, guid: f74d73acde897024090a352531df919f, type: 2}
|
||||
objectReference: {fileID: 11400000, guid: 8e119f168f1a6b745be02ef19f51610f, type: 2}
|
||||
- target: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_sharedMaterial
|
||||
value:
|
||||
objectReference: {fileID: -5194638153132371293, guid: f74d73acde897024090a352531df919f, type: 2}
|
||||
objectReference: {fileID: -8081454072124122709, guid: 8e119f168f1a6b745be02ef19f51610f, type: 2}
|
||||
- target: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_hasFontAssetChanged
|
||||
value: 0
|
||||
@ -7967,7 +7979,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
@ -7975,7 +7987,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
@ -8015,11 +8027,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 360
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -40
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
@ -8069,7 +8081,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
@ -8077,7 +8089,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
@ -8117,11 +8129,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 120
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -40
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
@ -8267,6 +8279,10 @@ PrefabInstance:
|
||||
propertyPath: m_fontSize
|
||||
value: 19
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1474592839158475786, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_hasFontAssetChanged
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2815703801643214741, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: TerrainItemInfo
|
||||
@ -8282,11 +8298,11 @@ PrefabInstance:
|
||||
- target: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_fontAsset
|
||||
value:
|
||||
objectReference: {fileID: 11400000, guid: f74d73acde897024090a352531df919f, type: 2}
|
||||
objectReference: {fileID: 11400000, guid: 8e119f168f1a6b745be02ef19f51610f, type: 2}
|
||||
- target: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_sharedMaterial
|
||||
value:
|
||||
objectReference: {fileID: -5194638153132371293, guid: f74d73acde897024090a352531df919f, type: 2}
|
||||
objectReference: {fileID: -8081454072124122709, guid: 8e119f168f1a6b745be02ef19f51610f, type: 2}
|
||||
- target: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_hasFontAssetChanged
|
||||
value: 0
|
||||
@ -8498,7 +8514,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
@ -8506,7 +8522,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
@ -8546,11 +8562,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 300
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -40
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
@ -8600,7 +8616,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
@ -8608,7 +8624,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
@ -8648,11 +8664,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 240
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -40
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
@ -8696,6 +8712,10 @@ PrefabInstance:
|
||||
propertyPath: m_fontSize
|
||||
value: 19
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1474592839158475786, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_hasFontAssetChanged
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2815703801643214741, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: 'ConnectItemInfo '
|
||||
@ -8711,11 +8731,11 @@ PrefabInstance:
|
||||
- target: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_fontAsset
|
||||
value:
|
||||
objectReference: {fileID: 11400000, guid: f74d73acde897024090a352531df919f, type: 2}
|
||||
objectReference: {fileID: 11400000, guid: 8e119f168f1a6b745be02ef19f51610f, type: 2}
|
||||
- target: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_sharedMaterial
|
||||
value:
|
||||
objectReference: {fileID: -5194638153132371293, guid: f74d73acde897024090a352531df919f, type: 2}
|
||||
objectReference: {fileID: -8081454072124122709, guid: 8e119f168f1a6b745be02ef19f51610f, type: 2}
|
||||
- target: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_hasFontAssetChanged
|
||||
value: 0
|
||||
@ -9078,6 +9098,10 @@ PrefabInstance:
|
||||
propertyPath: m_fontSize
|
||||
value: 19
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1474592839158475786, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_hasFontAssetChanged
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2815703801643214741, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: LuxuryItemInfo
|
||||
@ -9093,11 +9117,11 @@ PrefabInstance:
|
||||
- target: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_fontAsset
|
||||
value:
|
||||
objectReference: {fileID: 11400000, guid: f74d73acde897024090a352531df919f, type: 2}
|
||||
objectReference: {fileID: 11400000, guid: 8e119f168f1a6b745be02ef19f51610f, type: 2}
|
||||
- target: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_sharedMaterial
|
||||
value:
|
||||
objectReference: {fileID: -5194638153132371293, guid: f74d73acde897024090a352531df919f, type: 2}
|
||||
objectReference: {fileID: -8081454072124122709, guid: 8e119f168f1a6b745be02ef19f51610f, type: 2}
|
||||
- target: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_hasFontAssetChanged
|
||||
value: 0
|
||||
@ -9491,6 +9515,10 @@ PrefabInstance:
|
||||
propertyPath: m_fontSize
|
||||
value: 19
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1474592839158475786, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_hasFontAssetChanged
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2815703801643214741, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: CoinItemInfo
|
||||
@ -9506,11 +9534,11 @@ PrefabInstance:
|
||||
- target: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_fontAsset
|
||||
value:
|
||||
objectReference: {fileID: 11400000, guid: f74d73acde897024090a352531df919f, type: 2}
|
||||
objectReference: {fileID: 11400000, guid: 8e119f168f1a6b745be02ef19f51610f, type: 2}
|
||||
- target: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_sharedMaterial
|
||||
value:
|
||||
objectReference: {fileID: -5194638153132371293, guid: f74d73acde897024090a352531df919f, type: 2}
|
||||
objectReference: {fileID: -8081454072124122709, guid: 8e119f168f1a6b745be02ef19f51610f, type: 2}
|
||||
- target: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_hasFontAssetChanged
|
||||
value: 0
|
||||
@ -9722,7 +9750,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
@ -9730,7 +9758,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
@ -9770,11 +9798,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 420
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -40
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
@ -9818,6 +9846,10 @@ PrefabInstance:
|
||||
propertyPath: m_fontSize
|
||||
value: 19
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1474592839158475786, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_hasFontAssetChanged
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2815703801643214741, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: ResourceItemInfo
|
||||
@ -9833,11 +9865,11 @@ PrefabInstance:
|
||||
- target: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_fontAsset
|
||||
value:
|
||||
objectReference: {fileID: 11400000, guid: f74d73acde897024090a352531df919f, type: 2}
|
||||
objectReference: {fileID: 11400000, guid: 8e119f168f1a6b745be02ef19f51610f, type: 2}
|
||||
- target: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_sharedMaterial
|
||||
value:
|
||||
objectReference: {fileID: -5194638153132371293, guid: f74d73acde897024090a352531df919f, type: 2}
|
||||
objectReference: {fileID: -8081454072124122709, guid: 8e119f168f1a6b745be02ef19f51610f, type: 2}
|
||||
- target: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
propertyPath: m_hasFontAssetChanged
|
||||
value: 0
|
||||
@ -10274,7 +10306,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
@ -10282,7 +10314,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
@ -10322,11 +10354,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 60
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -40
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6003267594867130460, guid: 63ad2da40f8ceb74080c8f8a014d1bdc, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
|
||||
@ -68,8 +68,8 @@ MonoBehaviour:
|
||||
m_Calls: []
|
||||
m_text: "\u653B\u51FB"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: ce4904f8ddac15944907907115531ad5, type: 2}
|
||||
m_sharedMaterial: {fileID: 1214840240034325189, guid: ce4904f8ddac15944907907115531ad5, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: 8e119f168f1a6b745be02ef19f51610f, type: 2}
|
||||
m_sharedMaterial: {fileID: -8081454072124122709, guid: 8e119f168f1a6b745be02ef19f51610f, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1173,7 +1173,7 @@ MonoBehaviour:
|
||||
m_Calls: []
|
||||
m_text: "\u4EFB\u52A1\u5DF2\u5B8C\u6210\uFF0C\u8BF7\u64CD\u4F5C\u82F1\u96C4\u5355\u4F4D\u5347\u7EA7"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: f74d73acde897024090a352531df919f, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: 8e119f168f1a6b745be02ef19f51610f, type: 2}
|
||||
m_sharedMaterial: {fileID: -5194638153132371293, guid: f74d73acde897024090a352531df919f, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
@ -1237,7 +1237,7 @@ MonoBehaviour:
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_hasFontAssetChanged: 1
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!114 &5092696133207629085
|
||||
@ -1482,7 +1482,7 @@ MonoBehaviour:
|
||||
m_Calls: []
|
||||
m_text: "\u5DF2\u8FBE\u6700\u5927\u7B49\u7EA7"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: ca3ea612c29dc5f49a32dffc195e45fe, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: 8e119f168f1a6b745be02ef19f51610f, type: 2}
|
||||
m_sharedMaterial: {fileID: -8836383360333263746, guid: ca3ea612c29dc5f49a32dffc195e45fe, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
@ -1546,7 +1546,7 @@ MonoBehaviour:
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_hasFontAssetChanged: 1
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!114 &-2358477331949554288
|
||||
@ -1716,7 +1716,7 @@ MonoBehaviour:
|
||||
m_Calls: []
|
||||
m_text: "\u62E5\u6709Lv.{param}\u82F1\u96C4\u540E\u89E3\u9501"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: ca3ea612c29dc5f49a32dffc195e45fe, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: 8e119f168f1a6b745be02ef19f51610f, type: 2}
|
||||
m_sharedMaterial: {fileID: -8836383360333263746, guid: ca3ea612c29dc5f49a32dffc195e45fe, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
@ -1780,7 +1780,7 @@ MonoBehaviour:
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_hasFontAssetChanged: 1
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!114 &-1429575497353965241
|
||||
@ -2206,7 +2206,7 @@ MonoBehaviour:
|
||||
m_Calls: []
|
||||
m_text: "\u9009\u62E9\u65B0\u82F1\u96C4\u51FA\u6218\uFF01"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: ca3ea612c29dc5f49a32dffc195e45fe, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: 8e119f168f1a6b745be02ef19f51610f, type: 2}
|
||||
m_sharedMaterial: {fileID: -8836383360333263746, guid: ca3ea612c29dc5f49a32dffc195e45fe, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
@ -2270,7 +2270,7 @@ MonoBehaviour:
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_hasFontAssetChanged: 1
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!114 &3872025086125921462
|
||||
|
||||
@ -103,7 +103,7 @@ MonoBehaviour:
|
||||
m_HorizontalAlignment: 4
|
||||
m_VerticalAlignment: 512
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_characterSpacing: 40
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
@ -154,11 +154,35 @@ MonoBehaviour:
|
||||
FontID: 2
|
||||
TextCfg:
|
||||
- Type: 1
|
||||
FontSize: 68
|
||||
CharacterSpacing: 40
|
||||
WordSpacing: 0
|
||||
LineSpacing: 0
|
||||
ParagraphSpacing: 0
|
||||
- Type: 2
|
||||
FontSize: 68
|
||||
CharacterSpacing: 40
|
||||
WordSpacing: 0
|
||||
LineSpacing: 0
|
||||
ParagraphSpacing: 0
|
||||
- Type: 3
|
||||
FontSize: 68
|
||||
CharacterSpacing: 0
|
||||
WordSpacing: 0
|
||||
LineSpacing: 0
|
||||
ParagraphSpacing: 0
|
||||
- Type: 4
|
||||
FontSize: 52.2
|
||||
CharacterSpacing: 0
|
||||
WordSpacing: 0
|
||||
LineSpacing: 0
|
||||
ParagraphSpacing: 0
|
||||
- Type: 5
|
||||
FontSize: 68
|
||||
CharacterSpacing: 10
|
||||
WordSpacing: 0
|
||||
LineSpacing: 0
|
||||
ParagraphSpacing: 0
|
||||
--- !u!1 &1538021311469209037
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@ -1171,7 +1171,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: "\u6B22\u8FCE\u52A0\u5165\u5B98\u65B9Q\u7FA4952618884\uFF0C\u53CD\u9988\u60A8\u7684\u6E38\u620F\u4F53\u9A8C\u548C\u5EFA\u8BAE\u610F\u89C1~"
|
||||
m_text: "\u6B22\u8FCE\u52A0\u5165\u5B98\u65B9Q\u7FA4952618884\n\u53CD\u9988\u60A8\u7684\u6E38\u620F\u4F53\u9A8C\u548C\u5EFA\u8BAE\u610F\u89C1~"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8e119f168f1a6b745be02ef19f51610f, type: 2}
|
||||
m_sharedMaterial: {fileID: -8081454072124122709, guid: 8e119f168f1a6b745be02ef19f51610f, type: 2}
|
||||
@ -1255,7 +1255,7 @@ MonoBehaviour:
|
||||
Ban: 0
|
||||
NoExport: 0
|
||||
FontBan: 0
|
||||
ID: 17288
|
||||
ID: 1401
|
||||
FontID: 1
|
||||
TextCfg:
|
||||
- Type: 1
|
||||
@ -2053,7 +2053,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 1
|
||||
NoExport: 0
|
||||
FontBan: 0
|
||||
FontBan: 1
|
||||
ID: 1404
|
||||
FontID: 2
|
||||
TextCfg:
|
||||
|
||||
3690
Unity/Assets/Resources/Prefab/UI/Top/UITopWin.prefab
Normal file
3690
Unity/Assets/Resources/Prefab/UI/Top/UITopWin.prefab
Normal file
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 5f5313fd0ffef7e4da9c782ee8b139ad
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
8
Unity/Assets/Resources/TH1UI/UICharSprite.meta
Normal file
8
Unity/Assets/Resources/TH1UI/UICharSprite.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: edf0cc0e557ce7f4e9c9a12d8950b830
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Unity/Assets/Resources/TH1UI/UICharSprite/RemiliaWin.png
Normal file
BIN
Unity/Assets/Resources/TH1UI/UICharSprite/RemiliaWin.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 MiB |
114
Unity/Assets/Resources/TH1UI/UICharSprite/RemiliaWin.png.meta
Normal file
114
Unity/Assets/Resources/TH1UI/UICharSprite/RemiliaWin.png.meta
Normal file
@ -0,0 +1,114 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 9dff84a91334759479eab332a4598e50
|
||||
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:
|
||||
File diff suppressed because it is too large
Load Diff
@ -92,6 +92,8 @@ namespace TH1_Core.Events
|
||||
EventManager.Subscribe<UpdateUITopTopBar>(HandleUpdateUITopTopBar);
|
||||
EventManager.Subscribe<ShowUITopSetting>(HandleShowUITopSetting);
|
||||
EventManager.Subscribe<HideUITopSetting>(HandleHideUITopSetting);
|
||||
EventManager.Subscribe<ShowUITopWin>(HandleShowUITopWin);
|
||||
EventManager.Subscribe<HideUITopWin>(HandleHideUITopWin);
|
||||
|
||||
|
||||
|
||||
@ -163,6 +165,8 @@ namespace TH1_Core.Events
|
||||
EventManager.Unsubscribe<UpdateUITopTopBar>(HandleUpdateUITopTopBar);
|
||||
EventManager.Unsubscribe<ShowUITopSetting>(HandleShowUITopSetting);
|
||||
EventManager.Unsubscribe<HideUITopSetting>(HandleHideUITopSetting);
|
||||
EventManager.Unsubscribe<ShowUITopWin>(HandleShowUITopWin);
|
||||
EventManager.Unsubscribe<HideUITopWin>(HandleHideUITopWin);
|
||||
|
||||
|
||||
}
|
||||
@ -498,7 +502,17 @@ namespace TH1_Core.Events
|
||||
if (UIManager.Instance.UITopManager.TopBarController == null) return;
|
||||
UIManager.Instance.UITopManager.SettingController.Close();
|
||||
}
|
||||
|
||||
|
||||
private void HandleShowUITopWin(ShowUITopWin evt)
|
||||
{
|
||||
if (UIManager.Instance.UITopManager.WinController == null) return;
|
||||
UIManager.Instance.UITopManager.WinController.OpenWithParam(evt);
|
||||
}
|
||||
private void HandleHideUITopWin(HideUITopWin evt)
|
||||
{
|
||||
if (UIManager.Instance.UITopManager.WinController == null) return;
|
||||
UIManager.Instance.UITopManager.WinController.Close();
|
||||
}
|
||||
|
||||
private void HandleShowUIBottomRanking(ShowUIBottomRanking evt)
|
||||
{
|
||||
|
||||
@ -183,6 +183,9 @@ namespace TH1_Core.Events
|
||||
public struct ShowUITopSetting { }
|
||||
public struct HideUITopSetting { }
|
||||
|
||||
public struct ShowUITopWin { }
|
||||
public struct HideUITopWin { }
|
||||
|
||||
public enum UpdateTopBarType
|
||||
{
|
||||
UpdateFaith,
|
||||
|
||||
@ -52,8 +52,6 @@ namespace TH1_Core.Managers
|
||||
bool _gameInitReady;
|
||||
|
||||
public GameObject ROHintWindow;
|
||||
|
||||
public WinUI WinUI;
|
||||
public DebugUI DebugUI;
|
||||
public GameObject AIPlayingHint;
|
||||
public HintUI HintUI;
|
||||
@ -140,12 +138,9 @@ namespace TH1_Core.Managers
|
||||
//每一局游戏开始前，刷新与局内游戏相关的UI
|
||||
public void OnMatchStart()
|
||||
{
|
||||
WinUI = new WinUI();
|
||||
DebugUI = new DebugUI();
|
||||
_gameInitReady = true;
|
||||
ViewControllerManager.OnMatchStart();
|
||||
//UIOutsideManager.OnMatchStart();
|
||||
//TODO UI这边全部要更新MatchStart
|
||||
UIBottomManager.OnMatchStart();
|
||||
UITopManager.OnMatchStart();
|
||||
UIInfoManager.OnMatchStart();
|
||||
@ -162,7 +157,6 @@ namespace TH1_Core.Managers
|
||||
if(_gameInitReady)
|
||||
{
|
||||
//step #2
|
||||
WinUI?.Update();
|
||||
DebugUI?.Update();
|
||||
|
||||
//如果正在AIPlaying 更新AIHint
|
||||
|
||||
@ -251,6 +251,8 @@ public class PlayerInfo
|
||||
public string LeaderName;
|
||||
public Sprite LeaderIllustration;
|
||||
public Sprite LeaderAvatar;
|
||||
public Sprite WinPic;
|
||||
public Sprite LosePic;
|
||||
public Sprite PopulationSprite;
|
||||
public List<TechType> TechPool = new List<TechType>();
|
||||
public List<TechType> TechStart = new List<TechType>();
|
||||
|
||||
@ -56,8 +56,9 @@ namespace Logic.Multilingual
|
||||
BindFontID();
|
||||
if (FontID != 0)
|
||||
{
|
||||
var font = MultilingualManager.Instance.GetMultilingualFont(FontID);
|
||||
if (font) text.font = font;
|
||||
var font = MultilingualManager.Instance.GetMultilingualFont(FontID);
|
||||
if (font)text.font = font;
|
||||
MatchTextCfg(text, MultilingualManager.Instance.CurrentType);
|
||||
}
|
||||
}
|
||||
|
||||
@ -76,6 +77,7 @@ namespace Logic.Multilingual
|
||||
// TODO 临时转义换色
|
||||
text.text = text.text.Replace( "**<", "<color=orange>");
|
||||
text.text = text.text.Replace( ">**", "</color>");
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -34,7 +34,7 @@ namespace Logic.Skill
|
||||
|
||||
public override SkillType GetSkillType()
|
||||
{
|
||||
return SkillType.ESCAPE;
|
||||
return SkillType.ESCAPEPRO;
|
||||
}
|
||||
|
||||
public override void OnDamageOther(MapData mapData, SettlementInfo info)
|
||||
|
||||
@ -149,7 +149,7 @@ namespace TH1Renderer
|
||||
}
|
||||
|
||||
//InGame游戏结束时的生命周期
|
||||
public void OnGameClosed()
|
||||
public void OnMatchEnd()
|
||||
{
|
||||
InGameBubbleManager.OnGameClosed();
|
||||
}
|
||||
|
||||
@ -0,0 +1,86 @@
|
||||
// 文件位置建议: Assets/Scripts/TH1_UI/Controller/UIAnnounceMajorEventController.cs
|
||||
|
||||
using TH1_Core.Events;
|
||||
using TH1_Core.Managers;
|
||||
using TH1_Logic.Core;
|
||||
using TH1_UI.Controller.Base;
|
||||
using TH1_UI.View.Bottom;
|
||||
using TH1_UI.View.Top;
|
||||
using TH1Renderer;
|
||||
using UnityEngine;
|
||||
|
||||
// 确保这里引用了View脚本的命名空间
|
||||
|
||||
namespace TH1_UI.Controller.Top
|
||||
{
|
||||
public class UITopWinController : ViewController<UITopWinView> // 泛型参数是对应的View脚本
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// ✅ 【新增】一个空的构造函数，以满足 ViewControllerManager._CreateView 的 new() 泛型约束。
|
||||
/// </summary>
|
||||
public UITopWinController() { }
|
||||
|
||||
protected override void RegisterEventCallback()
|
||||
{
|
||||
base.RegisterEventCallback();
|
||||
if (WindowScript != null)
|
||||
{
|
||||
WindowScript.OnBtnCloseClick += _OnBtnCloseClick;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
protected override void UnregisterEventCallback()
|
||||
{
|
||||
if (WindowScript != null)
|
||||
{
|
||||
WindowScript.OnBtnCloseClick = null;
|
||||
}
|
||||
base.UnregisterEventCallback();
|
||||
}
|
||||
|
||||
protected override void OnOpen()
|
||||
{
|
||||
base.OnOpen();
|
||||
//WindowScript.SetContent();
|
||||
// 检查暂存的参数是否存在且类型正确
|
||||
if (_openParameter is ShowUITopWin evt)
|
||||
{
|
||||
// 使用接收到的数据设置UI内容
|
||||
if (WindowScript != null)
|
||||
{
|
||||
//Main.PlayerLogic.CalcAllPlayerScore(Main.MapData);
|
||||
WindowScript.SetContent();
|
||||
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// 如果没有参数或参数类型不符，可以提供默认内容或打印警告
|
||||
Debug.LogWarning("[UIInfoTechTree] Opened without valid parameters.");
|
||||
if (WindowScript != null)
|
||||
{
|
||||
|
||||
//WindowScript.SetContent("警告", "内容未提供");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public override bool Close()
|
||||
{
|
||||
WindowScript.CloseView();
|
||||
EventManager.Publish(new ShowUIOutsideMenu());
|
||||
//TODO 位置不应该在这里，目前服务于废弃的BubbleManager 后续迭代
|
||||
MapRenderer.Instance.OnMatchEnd();
|
||||
|
||||
|
||||
return base.Close();
|
||||
}
|
||||
|
||||
void _OnBtnCloseClick()
|
||||
{
|
||||
Close();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: fb971ff4444200349b193cbb2d3f4049
|
||||
guid: 987703041d0a2af4f8b90343b213b050
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
@ -38,6 +38,8 @@ namespace TH1_UI.Core
|
||||
|
||||
public static readonly string ViewTopTopBar = "UITopTopBar";
|
||||
public static readonly string ViewTopSetting = "UITopSetting";
|
||||
public static readonly string ViewTopWin = "UITopWin";
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@ -15,6 +15,7 @@ namespace TH1_UI.Core
|
||||
//直接暴露给外部可以直接操作
|
||||
public UITopTopBarController TopBarController;
|
||||
public UITopSettingController SettingController;
|
||||
public UITopWinController WinController;
|
||||
|
||||
// 初始化方法，用于设置初始状态或加载资源
|
||||
public void Init()
|
||||
@ -22,6 +23,7 @@ namespace TH1_UI.Core
|
||||
//Step #1 初始化Controller
|
||||
TopBarController = ViewControllerManager.UITopTopBarController;
|
||||
SettingController= ViewControllerManager.UITopSettingController;
|
||||
WinController = ViewControllerManager.UITopWinController;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -68,6 +68,8 @@ namespace TH1_UI.Core
|
||||
public static UITopTopBarController UITopTopBarController { get { return _topTopBarController; } }
|
||||
public static UITopSettingController UITopSettingController { get { return _topSettingController; } }
|
||||
|
||||
public static UITopWinController UITopWinController { get { return _topWinController; } }
|
||||
|
||||
|
||||
|
||||
|
||||
@ -127,6 +129,7 @@ namespace TH1_UI.Core
|
||||
// ================================================= Top ================================================================
|
||||
_topTopBarController = _CreateView<UITopTopBarController>("Top", UIResourceName.ViewTopTopBar, ViewDestroyDomain.None,UIRootType.TopUI);
|
||||
_topSettingController = _CreateView<UITopSettingController>("Top", UIResourceName.ViewTopSetting, ViewDestroyDomain.None,UIRootType.TopUI);
|
||||
_topWinController = _CreateView<UITopWinController>("Top", UIResourceName.ViewTopWin, ViewDestroyDomain.None,UIRootType.TopUI);
|
||||
|
||||
// ================================================= 通用 ================================================================
|
||||
|
||||
@ -272,6 +275,8 @@ namespace TH1_UI.Core
|
||||
private static UIBottomNetController _bottomNetController = null;
|
||||
private static UITopTopBarController _topTopBarController = null;
|
||||
private static UITopSettingController _topSettingController = null;
|
||||
private static UITopWinController _topWinController = null;
|
||||
|
||||
|
||||
static Dictionary<string, IViewControllerInterface> _viewDict = new Dictionary<string, IViewControllerInterface>();
|
||||
|
||||
|
||||
@ -83,7 +83,7 @@ namespace TH1_UI.View.Bottom
|
||||
{
|
||||
if(Main.MapData?.Net.Mode == NetMode.Multi)
|
||||
LobbyManager.Instance.Lobby?.LeaveLobby();
|
||||
MapRenderer.Instance.OnGameClosed();
|
||||
MapRenderer.Instance.OnMatchEnd();
|
||||
OnBtnCloseClick.Invoke();
|
||||
//UIManager.Instance.GameUI.MainUI.NeedShow = true;
|
||||
EventManager.Publish(new ShowUIOutsideMenu());
|
||||
|
||||
87
Unity/Assets/Scripts/TH1_UI/View/Top/UITopWinView.cs
Normal file
87
Unity/Assets/Scripts/TH1_UI/View/Top/UITopWinView.cs
Normal file
@ -0,0 +1,87 @@
|
||||
using Logic.Audio;
|
||||
using Logic.Multilingual;
|
||||
using TH1_Logic.Core;
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
namespace TH1_UI.View.Top
|
||||
{
|
||||
public class UITopWinView : Base.View
|
||||
{
|
||||
//public Button closeButton;
|
||||
public ViDelegateAssisstant.Dele OnBtnCloseClick;
|
||||
|
||||
public Button CloseButton;
|
||||
|
||||
public TextMeshProUGUI WinTitle1;
|
||||
public TextMeshProUGUI WinTitle2;
|
||||
public TextMeshProUGUI TurnCount;
|
||||
public TextMeshProUGUI CityCount;
|
||||
public TextMeshProUGUI Score;
|
||||
public Image TopbarBG;
|
||||
public Image WinFlowerDeco;
|
||||
public Image WinPic;
|
||||
|
||||
public Image AvatarImg;
|
||||
public RectTransform ChatBubble;
|
||||
public TextMeshProUGUI ChatText;
|
||||
|
||||
private Color _winTextColor = Color.white;
|
||||
private Color _loseTextColor = new Color32(0xC7, 0xC7, 0xC7, 255);
|
||||
private Color _winTopbarColor = Color.white;
|
||||
private Color _loseTopbarColor = new Color(0f,0f,0f,0.2f);
|
||||
|
||||
protected override void OnInit()
|
||||
{
|
||||
base.OnInit();
|
||||
CloseButton.onClick.RemoveAllListeners();
|
||||
CloseButton.onClick.AddListener(() => { OnBtnCloseClick.Invoke(); });
|
||||
//CheckPanel.InitStart(RefreshStatus);
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
//通常一局只会set一次,每次都是完全清空，然后绑定新的一个对局的按钮
|
||||
public void SetContent()
|
||||
{
|
||||
RefreshData();
|
||||
}
|
||||
|
||||
public void RefreshData()
|
||||
{
|
||||
if (Main.MapData == null) return;
|
||||
if (!Main.MapData.CheckIfGameEnd(out var isWin)) return;
|
||||
|
||||
MultilingualManager.Instance.SetUIText(WinTitle1,isWin? Table.Instance.TextDataAssets.WinUIWinText: Table.Instance.TextDataAssets.WinUILoseText);
|
||||
WinTitle1.color = isWin?_winTextColor:_loseTextColor;
|
||||
MultilingualManager.Instance.SetUIText(WinTitle2,isWin? Table.Instance.TextDataAssets.WinUIWinText: Table.Instance.TextDataAssets.WinUILoseText);
|
||||
WinTitle2.color = isWin?_winTextColor:_loseTextColor;
|
||||
|
||||
if (Table.Instance.PlayerDataAssets.GetPlayerInfo(Main.MapData.PlayerMap.SelfPlayerData, out var info))
|
||||
{
|
||||
MultilingualManager.Instance.SetUIText(ChatText,info.GetRandomWinChat());
|
||||
LayoutRebuilder.ForceRebuildLayoutImmediate(ChatBubble);
|
||||
}
|
||||
|
||||
TopbarBG.color = isWin ? _winTopbarColor : _loseTextColor;
|
||||
|
||||
AvatarImg.sprite = info.LeaderAvatar;
|
||||
WinPic.sprite = isWin ? info.WinPic : info.LosePic;
|
||||
|
||||
WinFlowerDeco.gameObject.SetActive(isWin);
|
||||
CityCount.text = Main.MapData.GetCityCount(Main.MapData.PlayerMap.SelfPlayerData.Id).ToString();
|
||||
TurnCount.text = Main.MapData.PlayerMap.SelfPlayerData.Turn.ToString();
|
||||
Score.text = Main.MapData.PlayerMap.SelfPlayerData.PlayerScore.ToString();
|
||||
}
|
||||
|
||||
public void CloseView()
|
||||
{
|
||||
AudioManager.Instance.StopMusic();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
11
Unity/Assets/Scripts/TH1_UI/View/Top/UITopWinView.cs.meta
Normal file
11
Unity/Assets/Scripts/TH1_UI/View/Top/UITopWinView.cs.meta
Normal file
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: be4b51f0907b87d499ede5a2b415a5d0
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,131 +0,0 @@
|
||||
using UnityEngine;
|
||||
using TMPro;
|
||||
using Animancer;
|
||||
using Logic;
|
||||
using RuntimeData;
|
||||
using UnityEngine.UI;
|
||||
using System.Collections.Generic;
|
||||
using Logic.Multilingual;
|
||||
using ParadoxNotion.Design;
|
||||
using TH1_Core.Events;
|
||||
using TH1_Core.Managers;
|
||||
using TH1_Logic.Core;
|
||||
using TH1_UI;
|
||||
using TH1Renderer;
|
||||
using TH1Resource;
|
||||
using UI;
|
||||
|
||||
public class WinUI
|
||||
{
|
||||
private GameObject _ROWinUI;
|
||||
private Button _returnButton;
|
||||
private bool _curGameDone;
|
||||
private RectTransform _chat;
|
||||
private TextMeshProUGUI _chatText;
|
||||
private Image _topBar;
|
||||
public WinUI()
|
||||
{
|
||||
_ROWinUI = UIManager.Instance.ROUIManager.transform.Find("WinPanel").gameObject;
|
||||
_ROWinUI.gameObject.SetActive(false);
|
||||
_returnButton = _ROWinUI.transform.Find("MsgList/Row4/Button").GetComponent<Button>(); // ← 新增按钮
|
||||
_returnButton.onClick.RemoveAllListeners();
|
||||
_returnButton.onClick.AddListener(OnReturnClicked); // ← 新增点击监听
|
||||
var player = Main.MapData.PlayerMap.SelfPlayerData;
|
||||
Table.Instance.PlayerDataAssets.GetPlayerInfo(player, out var info);
|
||||
_ROWinUI.transform.Find("CharMask/Char").GetComponent<Image>().sprite = info.LeaderAvatar;
|
||||
|
||||
_chat = _ROWinUI.transform.Find("Chat").GetComponent<RectTransform>();
|
||||
_chatText = _ROWinUI.transform.Find("Chat/Text").GetComponent<TextMeshProUGUI>();
|
||||
_topBar = _ROWinUI.transform.Find("TopBar").GetComponent<Image>();
|
||||
_curGameDone = false;
|
||||
}
|
||||
|
||||
public void Show()
|
||||
{
|
||||
_ROWinUI.gameObject.SetActive(true);
|
||||
LayoutRebuilder.ForceRebuildLayoutImmediate(_chat);
|
||||
var anim = _ROWinUI.GetComponent<AnimancerComponent>();
|
||||
if (anim != null)
|
||||
anim.Play(ResourceCache.Instance.AnimCache.UICommonPanelFadeIn);
|
||||
}
|
||||
public void Update()
|
||||
{
|
||||
if (_ROWinUI.activeSelf || _curGameDone)
|
||||
return;
|
||||
if (Main.MapData == null) return;
|
||||
if (!Main.MapData.CheckIfGameEnd(out var isWin)) return;
|
||||
if (isWin)
|
||||
{
|
||||
_curGameDone = true;
|
||||
var tt = _ROWinUI.transform.Find("Title")?.GetComponent<TextMeshProUGUI>();
|
||||
if (tt != null)
|
||||
{
|
||||
tt.text = "胜利!";
|
||||
tt.color = Color.white;
|
||||
if (Table.Instance.PlayerDataAssets.GetPlayerInfo(Main.MapData.PlayerMap.SelfPlayerData, out var info))
|
||||
{
|
||||
MultilingualManager.Instance.SetUIText(_chatText,info.GetRandomWinChat());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
MultilingualManager.Instance.SetUIText(_ROWinUI.transform.Find("Title")?.GetComponent<TextMeshProUGUI>(),
|
||||
Table.Instance.TextDataAssets.WinUIWinText);*/
|
||||
_ROWinUI.transform.Find("flowerDeco").gameObject.SetActive(true);
|
||||
_topBar.color = Color.white;
|
||||
_ROWinUI.transform.Find("MsgList/Row1/Value").GetComponent<TextMeshProUGUI>().text = Main.MapData.GetCityCount(Main.MapData.PlayerMap.SelfPlayerData.Id).ToString();
|
||||
_ROWinUI.transform.Find("MsgList/Row2/Value").GetComponent<TextMeshProUGUI>().text = Main.MapData.PlayerMap.SelfPlayerData.Turn.ToString();
|
||||
_ROWinUI.transform.Find("MsgList/Row3/Value").GetComponent<TextMeshProUGUI>().text = Main.MapData.PlayerMap.SelfPlayerData.PlayerScore.ToString();
|
||||
Show();
|
||||
}
|
||||
else
|
||||
{
|
||||
_curGameDone = true;
|
||||
var tt = _ROWinUI.transform.Find("Title")?.GetComponent<TextMeshProUGUI>();
|
||||
if (tt != null)
|
||||
{
|
||||
tt.text = "失败...";
|
||||
tt.color = new Color32(0xC7, 0xC7, 0xC7, 255);
|
||||
if (Table.Instance.PlayerDataAssets.GetPlayerInfo(Main.MapData.PlayerMap.SelfPlayerData, out var info))
|
||||
{
|
||||
MultilingualManager.Instance.SetUIText(_chatText,info.GetRandomLoseChat());
|
||||
}
|
||||
}
|
||||
|
||||
//TODO 有bug 暂时先用替代方案
|
||||
/*MultilingualManager.Instance.SetUIText(_ROWinUI.transform.Find("Title")?.GetComponent<TextMeshProUGUI>(),
|
||||
Table.Instance.TextDataAssets.WinUILoseText);
|
||||
Debug.Log(Table.Instance.TextDataAssets.WinUILoseText);*/
|
||||
_topBar.color = new Color(0f,0f,0f,0.2f);
|
||||
_ROWinUI.transform.Find("flowerDeco").gameObject.SetActive(false);
|
||||
_ROWinUI.transform.Find("MsgList/Row1/Value").GetComponent<TextMeshProUGUI>().text = Main.MapData.GetCityCount(Main.MapData.PlayerMap.SelfPlayerData.Id).ToString();
|
||||
_ROWinUI.transform.Find("MsgList/Row2/Value").GetComponent<TextMeshProUGUI>().text = (Main.MapData.PlayerMap.SelfPlayerData.Turn).ToString();
|
||||
_ROWinUI.transform.Find("MsgList/Row3/Value").GetComponent<TextMeshProUGUI>().text = Main.MapData.PlayerMap.SelfPlayerData.PlayerScore.ToString();
|
||||
Show();
|
||||
}
|
||||
|
||||
// 如果没有正在显示，并且有排队的消息，就开始显示
|
||||
}
|
||||
|
||||
public void OnReturnClicked()
|
||||
{
|
||||
Main.Instance.GameLogic.ChangeState(GameState.Menu);
|
||||
var anim = _ROWinUI.GetComponent<AnimancerComponent>();
|
||||
if (anim != null)
|
||||
{
|
||||
anim.Play(ResourceCache.Instance.AnimCache.UICommonPanelFadeOut);
|
||||
Timer.Instance.TimerRegister(this, () =>
|
||||
{
|
||||
_ROWinUI.gameObject.SetActive(false);
|
||||
},ResourceCache.Instance.AnimCache.UICommonPanelFadeOut.length,"WinUI_OnReturnClicked");
|
||||
}
|
||||
else
|
||||
_ROWinUI.gameObject.SetActive(false);
|
||||
EventManager.Publish(new ShowUIOutsideMenu());
|
||||
//UIManager.Instance.GameUI.ShowMainUIManager();
|
||||
|
||||
//处理MapRenderer和UIManager的生命周期：OnGameClosed
|
||||
MapRenderer.Instance.OnGameClosed();
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user