更新一般UI
@ -1395,7 +1395,7 @@ MonoBehaviour:
|
||||
- SkillType: 180
|
||||
SkillViewType: 1
|
||||
SkillName: "\u9AD8\u5929\u539F\u6025\u884C"
|
||||
SkillDesc: "\u53EF\u4EE5\u5728\u4EFB\u610F\u6211\u65B9**<\u57CE\u5E02\u4E2D\u5FC3>**\u548C**<\u5929\u72D7\u9152\u9986>**\u4EF6\u4F20\u9001"
|
||||
SkillDesc: "\u53EF\u4EE5\u5728\u4EFB\u610F\u6211\u65B9**<\u57CE\u5E02\u4E2D\u5FC3>**\u548C**<\u5929\u72D7\u9152\u9986>**\u89C1\u4F20\u9001\u3002\u53EA\u80FD\u5728**<\u5C71\u8109>**\u4E4B\u95F4\u79FB\u52A8\u3002"
|
||||
NotShow: 0
|
||||
SkillIcon: {fileID: 21300000, guid: 8a0140bbadde3444d821374ce2874af5, type: 3}
|
||||
HasShowList: 0
|
||||
|
||||
@ -3572,13 +3572,13 @@ MonoBehaviour:
|
||||
GiantCivId: 0
|
||||
GiantForceId: 0
|
||||
Name: "\u5929\u72D7\u4EF2\u88C1\u8005"
|
||||
Desc: "\u5B88\u77E2\u5E1D\u56FD\u7279\u8272\u5355\u4F4D\u3002\u62E5\u67092\u5C04\u7A0B\uFF0C3.5\u653B\u51FB\uFF0C0\u79FB\u52A8\u529B\uFF0C\u62E5\u6709<color=orange>\u8FDE\u6740</color>\uFF0C<color=orange>\u79FB\u52A8\u653B\u51FB</color>\uFF0C<color=orange>\u5C71\u5CB3\u5DE1\u884C</color>\u3001<color=orange>\u5BB9\u514B\u519B\u5B98</color>\uFF0C<color=orange>\u9AD8\u5929\u539F\u6025\u884C</color>\u7B49\u7279\u8272\u6280\u80FD\u3002"
|
||||
Desc: "\u5B88\u77E2\u5E1D\u56FD\u7279\u8272\u5355\u4F4D\u3002\u62E5\u67092\u5C04\u7A0B\uFF0C3.5\u653B\u51FB\uFF0C\u62E5\u6709<color=orange>\u8FDE\u7EED\u51FB\u6740</color>\uFF0C<color=orange>\u79FB\u52A8\u653B\u51FB</color>\uFF0C<color=orange>\u5C71\u5CB3\u5DE1\u884C</color>\u3001<color=orange>\u5BB9\u514B\u519B\u5B98</color>\uFF0C<color=orange>\u9AD8\u5929\u539F\u6025\u884C</color>\u7B49\u7279\u8272\u6280\u80FD\u3002"
|
||||
LandType: 3
|
||||
NoMaxHealth: 0
|
||||
MaxHealth: 15
|
||||
Attack: 3.5
|
||||
Defense: 2
|
||||
MoveRange: 0
|
||||
MoveRange: 1
|
||||
AttackRange: 2
|
||||
Cost: 8
|
||||
Skills: 930000000200000008000000b3000000b400000004000000
|
||||
|
||||
@ -103027,4 +103027,106 @@ MonoBehaviour:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
- ID: 16949
|
||||
ZH: "\u4E0B\u4E00\u56DE\u5408"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
- ID: 16950
|
||||
ZH: "\u751F\u547D"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
- ID: 16951
|
||||
ZH: "\u653B\u51FB"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
- ID: 16952
|
||||
ZH: "\u5C04\u7A0B"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
- ID: 16953
|
||||
ZH: "\u79FB\u52A8"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
- ID: 16954
|
||||
ZH: "\u901A\u884C"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
- ID: 16955
|
||||
ZH: "+5\u6BCF\u56DE\u5408"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
- ID: 16956
|
||||
ZH: "\u91D1\u5E01"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
- ID: 16957
|
||||
ZH: "+3\u6BCF\u56DE\u5408"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
- ID: 16958
|
||||
ZH: "1\u79CD\u5962\u4F88\u54C1"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
- ID: 16959
|
||||
ZH: "\u5730\u5F62"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
- ID: 16960
|
||||
ZH: "\u81EA\u7136\u8D44\u6E90"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
- ID: 16961
|
||||
ZH: "\u5EFA\u7B51"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
- ID: 16962
|
||||
ZH: "\u57CE\u5E02\u3010{param}\u3011\u5DF2\u5347\u7EA7"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
- ID: 16963
|
||||
ZH: "\u8BF7\u4ECE\u4E0B\u65B9\u9009\u62E9\u4E00\u9879\u5347\u7EA7"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
- ID: 16964
|
||||
ZH: "\u53EF\u4EE5\u5728\u4EFB\u610F\u6211\u65B9**<\u57CE\u5E02\u4E2D\u5FC3>**\u548C**<\u5929\u72D7\u9152\u9986>**\u89C1\u4F20\u9001\u3002\u53EA\u80FD\u5728**<\u5C71\u8109>**\u4E4B\u95F4\u79FB\u52A8\u3002"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
- ID: 16965
|
||||
ZH: "\u5B88\u77E2\u5E1D\u56FD\u7279\u8272\u5355\u4F4D\u3002\u62E5\u67092\u5C04\u7A0B\uFF0C3.5\u653B\u51FB\uFF0C\u62E5\u6709<color=orange>\u8FDE\u7EED\u51FB\u6740</color>\uFF0C<color=orange>\u79FB\u52A8\u653B\u51FB</color>\uFF0C<color=orange>\u5C71\u5CB3\u5DE1\u884C</color>\u3001<color=orange>\u5BB9\u514B\u519B\u5B98</color>\uFF0C<color=orange>\u9AD8\u5929\u539F\u6025\u884C</color>\u7B49\u7279\u8272\u6280\u80FD\u3002"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
TargetTypes: 0100000001000000010000000100000001000000
|
||||
|
||||
@ -1388,7 +1388,7 @@ MonoBehaviour:
|
||||
- SkillType: 180
|
||||
SkillViewType: 1
|
||||
SkillName: 16640
|
||||
SkillDesc: 16840
|
||||
SkillDesc: 16964
|
||||
NotShow: 0
|
||||
SkillIcon: {fileID: 21300000, guid: 8a0140bbadde3444d821374ce2874af5, type: 3}
|
||||
HasShowList: 0
|
||||
|
||||
@ -3572,13 +3572,13 @@ MonoBehaviour:
|
||||
GiantCivId: 0
|
||||
GiantForceId: 0
|
||||
Name: 9682
|
||||
Desc: 16650
|
||||
Desc: 16965
|
||||
LandType: 3
|
||||
NoMaxHealth: 0
|
||||
MaxHealth: 15
|
||||
Attack: 3.5
|
||||
Defense: 2
|
||||
MoveRange: 0
|
||||
MoveRange: 1
|
||||
AttackRange: 2
|
||||
Cost: 8
|
||||
Skills: 930000000200000008000000b3000000b400000004000000
|
||||
|
||||
21840
Unity/Assets/Resources/Prefab/UI/Bottom/UIBottomBottomBar.prefab
Normal file
@ -2955,7 +2955,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 147, y: -23}
|
||||
m_SizeDelta: {x: 120.01, y: 32.0265}
|
||||
m_SizeDelta: {x: 0, y: 32.0265}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5182836495056545005
|
||||
CanvasRenderer:
|
||||
@ -4193,7 +4193,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: -575.093}
|
||||
m_AnchoredPosition: {x: 250, y: -480.093}
|
||||
m_SizeDelta: {x: 500, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1555931548957767936
|
||||
@ -6039,8 +6039,32 @@ PrefabInstance:
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 195022892475108934, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 4120158833699072609}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
--- !u!1 &541081793361804450 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 195022892475108934, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
m_PrefabInstance: {fileID: 375649589175169764}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &4120158833699072609
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 541081793361804450}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 1140
|
||||
FontID: 0
|
||||
TextCfg: []
|
||||
--- !u!114 &8534265846690400848 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
@ -6196,8 +6220,32 @@ PrefabInstance:
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 4241951205922492806, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: -151525643435233576}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
--- !u!1 &3474541515111193283 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4241951205922492806, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
m_PrefabInstance: {fileID: 785452884929022789}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &-151525643435233576
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3474541515111193283}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 2491
|
||||
FontID: 0
|
||||
TextCfg: []
|
||||
--- !u!224 &8217926644072183458 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 8713776446874844647, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
@ -6208,7 +6256,7 @@ MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
m_PrefabInstance: {fileID: 785452884929022789}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_GameObject: {fileID: 3474541515111193283}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
@ -6427,8 +6475,32 @@ PrefabInstance:
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 195022892475108934, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 757682604290354552}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
--- !u!1 &1272405224603990394 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 195022892475108934, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
m_PrefabInstance: {fileID: 1377153187191158588}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &757682604290354552
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1272405224603990394}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 16950
|
||||
FontID: 0
|
||||
TextCfg: []
|
||||
--- !u!114 &6937231569147334536 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
@ -6584,14 +6656,62 @@ PrefabInstance:
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 4241951205922492806, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: -8007551776773180601}
|
||||
- targetCorrespondingSourceObject: {fileID: 195022892475108934, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: -159999406782215306}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
--- !u!1 &1240733581572408650 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 195022892475108934, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
m_PrefabInstance: {fileID: 1406008018592189196}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &-159999406782215306
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1240733581572408650}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 1405
|
||||
FontID: 0
|
||||
TextCfg: []
|
||||
--- !u!1 &2980631928560229002 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4241951205922492806, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
m_PrefabInstance: {fileID: 1406008018592189196}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &-8007551776773180601
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2980631928560229002}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 16957
|
||||
FontID: 0
|
||||
TextCfg: []
|
||||
--- !u!114 &6979024757609837496 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
m_PrefabInstance: {fileID: 1406008018592189196}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_GameObject: {fileID: 2980631928560229002}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
@ -6697,8 +6817,32 @@ PrefabInstance:
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 195022892475108934, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: -1639314977029829546}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
--- !u!1 &1668455501172045232 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 195022892475108934, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
m_PrefabInstance: {fileID: 1554682201582058486}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &-1639314977029829546
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1668455501172045232}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 16951
|
||||
FontID: 0
|
||||
TextCfg: []
|
||||
--- !u!114 &7406743413021721410 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
@ -7026,8 +7170,32 @@ PrefabInstance:
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 195022892475108934, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 5489639589700094720}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
--- !u!1 &3449703792002819853 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 195022892475108934, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
m_PrefabInstance: {fileID: 3272730564585138507}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &5489639589700094720
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3449703792002819853}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 16953
|
||||
FontID: 0
|
||||
TextCfg: []
|
||||
--- !u!224 &6162787520398152876 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 8713776446874844647, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
@ -7183,14 +7351,62 @@ PrefabInstance:
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 4241951205922492806, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 701862417028831850}
|
||||
- targetCorrespondingSourceObject: {fileID: 195022892475108934, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 2262654621497099913}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
--- !u!1 &622742221695763452 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4241951205922492806, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
m_PrefabInstance: {fileID: 3637251422440690298}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &701862417028831850
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 622742221695763452}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 60
|
||||
FontID: 0
|
||||
TextCfg: []
|
||||
--- !u!1 &3516960205135993916 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 195022892475108934, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
m_PrefabInstance: {fileID: 3637251422440690298}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &2262654621497099913
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3516960205135993916}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 16961
|
||||
FontID: 0
|
||||
TextCfg: []
|
||||
--- !u!114 &4693668046028991182 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
m_PrefabInstance: {fileID: 3637251422440690298}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_GameObject: {fileID: 622742221695763452}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
@ -7646,8 +7862,56 @@ PrefabInstance:
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 4241951205922492806, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 6275415333693995471}
|
||||
- targetCorrespondingSourceObject: {fileID: 195022892475108934, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: -1682176707618072388}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
--- !u!1 &396285849069613155 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4241951205922492806, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
m_PrefabInstance: {fileID: 4585108369165132261}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &6275415333693995471
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 396285849069613155}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 1434
|
||||
FontID: 0
|
||||
TextCfg: []
|
||||
--- !u!1 &4401511679004667811 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 195022892475108934, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
m_PrefabInstance: {fileID: 4585108369165132261}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &-1682176707618072388
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4401511679004667811}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 16959
|
||||
FontID: 0
|
||||
TextCfg: []
|
||||
--- !u!224 &5137514561336892418 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 8713776446874844647, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
@ -7658,7 +7922,7 @@ MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
m_PrefabInstance: {fileID: 4585108369165132261}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_GameObject: {fileID: 396285849069613155}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
@ -8007,7 +8271,10 @@ PrefabInstance:
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 4241951205922492806, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 5545065872352911334}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
--- !u!224 &3513555154947318795 stripped
|
||||
RectTransform:
|
||||
@ -8019,12 +8286,33 @@ MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
m_PrefabInstance: {fileID: 5201422613246859756}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_GameObject: {fileID: 8282500607111039082}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &8282500607111039082 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4241951205922492806, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
m_PrefabInstance: {fileID: 5201422613246859756}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &5545065872352911334
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8282500607111039082}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 839
|
||||
FontID: 0
|
||||
TextCfg: []
|
||||
--- !u!1001 &5241236472158033888
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -8132,7 +8420,10 @@ PrefabInstance:
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 195022892475108934, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: -4253570977527659482}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
--- !u!224 &3481583020399323655 stripped
|
||||
RectTransform:
|
||||
@ -8150,6 +8441,27 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &5334584697785768358 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 195022892475108934, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
m_PrefabInstance: {fileID: 5241236472158033888}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &-4253570977527659482
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5334584697785768358}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 16952
|
||||
FontID: 0
|
||||
TextCfg: []
|
||||
--- !u!1001 &5509544898932356365
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -8289,7 +8601,10 @@ PrefabInstance:
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 4241951205922492806, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 2484666373571792975}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
--- !u!224 &3789876289172556010 stripped
|
||||
RectTransform:
|
||||
@ -8301,12 +8616,33 @@ MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
m_PrefabInstance: {fileID: 5509544898932356365}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_GameObject: {fileID: 8551110563984401547}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &8551110563984401547 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4241951205922492806, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
m_PrefabInstance: {fileID: 5509544898932356365}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &2484666373571792975
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8551110563984401547}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 16958
|
||||
FontID: 0
|
||||
TextCfg: []
|
||||
--- !u!1001 &5606474621051009556
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -8666,14 +9002,20 @@ PrefabInstance:
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 4241951205922492806, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 8834104747435058812}
|
||||
- targetCorrespondingSourceObject: {fileID: 195022892475108934, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1392285236185371012}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
--- !u!114 &2665172903021101512 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
m_PrefabInstance: {fileID: 6315672305077172604}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_GameObject: {fileID: 7889099671986596090}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
@ -8684,6 +9026,48 @@ RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 8713776446874844647, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
m_PrefabInstance: {fileID: 6315672305077172604}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &6129709388952893242 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 195022892475108934, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
m_PrefabInstance: {fileID: 6315672305077172604}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1392285236185371012
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6129709388952893242}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 16956
|
||||
FontID: 0
|
||||
TextCfg: []
|
||||
--- !u!1 &7889099671986596090 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4241951205922492806, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
m_PrefabInstance: {fileID: 6315672305077172604}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &8834104747435058812
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7889099671986596090}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 16955
|
||||
FontID: 0
|
||||
TextCfg: []
|
||||
--- !u!1001 &6425571381626970452
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -8925,14 +9309,20 @@ PrefabInstance:
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 4241951205922492806, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: -4625793089156191330}
|
||||
- targetCorrespondingSourceObject: {fileID: 195022892475108934, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: -4766023442499324867}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
--- !u!114 &1227612410524247092 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
m_PrefabInstance: {fileID: 7084166775702346880}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_GameObject: {fileID: 6381165281432046854}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
@ -8943,6 +9333,48 @@ RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 8713776446874844647, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
m_PrefabInstance: {fileID: 7084166775702346880}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &6381165281432046854 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4241951205922492806, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
m_PrefabInstance: {fileID: 7084166775702346880}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &-4625793089156191330
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6381165281432046854}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 876
|
||||
FontID: 0
|
||||
TextCfg: []
|
||||
--- !u!1 &6981943296642814662 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 195022892475108934, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
m_PrefabInstance: {fileID: 7084166775702346880}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &-4766023442499324867
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6981943296642814662}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 16960
|
||||
FontID: 0
|
||||
TextCfg: []
|
||||
--- !u!1001 &7688899771288433594
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -9070,7 +9502,13 @@ PrefabInstance:
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 4241951205922492806, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 8473209847386893968}
|
||||
- targetCorrespondingSourceObject: {fileID: 195022892475108934, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: -3859526735209574433}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
--- !u!224 &1322360749537447517 stripped
|
||||
RectTransform:
|
||||
@ -9082,12 +9520,54 @@ MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 8311778892993296564, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
m_PrefabInstance: {fileID: 7688899771288433594}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_GameObject: {fileID: 5794450189044834876}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &5794450189044834876 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4241951205922492806, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
m_PrefabInstance: {fileID: 7688899771288433594}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &8473209847386893968
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5794450189044834876}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 16941
|
||||
FontID: 0
|
||||
TextCfg: []
|
||||
--- !u!1 &7494176504322391548 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 195022892475108934, guid: fddfc62962497f44abd6ff60ed72dd67, type: 3}
|
||||
m_PrefabInstance: {fileID: 7688899771288433594}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &-3859526735209574433
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7494176504322391548}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 16954
|
||||
FontID: 0
|
||||
TextCfg: []
|
||||
--- !u!1001 &8759559494060682557
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@ -11,6 +11,7 @@ GameObject:
|
||||
- component: {fileID: 5097334103084384068}
|
||||
- component: {fileID: 3961960369828164240}
|
||||
- component: {fileID: 1474592839158475786}
|
||||
- component: {fileID: -2092436487732017068}
|
||||
m_Layer: 5
|
||||
m_Name: HintTitleText
|
||||
m_TagString: Untagged
|
||||
@ -134,6 +135,22 @@ MonoBehaviour:
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!114 &-2092436487732017068
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 195022892475108934}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 16951
|
||||
FontID: 0
|
||||
TextCfg: []
|
||||
--- !u!1 &1234358712238196920
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@ -2145,6 +2145,10 @@ PrefabInstance:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 8744354601687060637}
|
||||
m_Modifications:
|
||||
- target: {fileID: -1429575497353965241, guid: 08691a9455a11ed4e86496ad244b552d, type: 3}
|
||||
propertyPath: ID
|
||||
value: 16664
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1154529743981020495, guid: 08691a9455a11ed4e86496ad244b552d, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: UIInfoHeroSelectRow
|
||||
@ -2470,6 +2474,10 @@ PrefabInstance:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 8744354601687060637}
|
||||
m_Modifications:
|
||||
- target: {fileID: -1429575497353965241, guid: 08691a9455a11ed4e86496ad244b552d, type: 3}
|
||||
propertyPath: ID
|
||||
value: 16663
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1154529743981020495, guid: 08691a9455a11ed4e86496ad244b552d, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: UIInfoHeroSelectRow (2)
|
||||
|
||||
@ -305,7 +305,6 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
_showAnimationClip: {fileID: 0}
|
||||
_hideAnimationClip: {fileID: 0}
|
||||
Animancer: {fileID: 3744185796736103011}
|
||||
--- !u!114 &2620541457959878801
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@ -1090,7 +1090,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: 295, y: -867.506}
|
||||
m_AnchoredPosition: {x: 295, y: -464.99097}
|
||||
m_SizeDelta: {x: 510, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7006890349929909733
|
||||
@ -2406,7 +2406,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: 295, y: -464.79425}
|
||||
m_AnchoredPosition: {x: 295, y: -402.29425}
|
||||
m_SizeDelta: {x: 510, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &8922829779812078697
|
||||
@ -3184,7 +3184,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: 295, y: -682.496}
|
||||
m_AnchoredPosition: {x: 295, y: -464.99097}
|
||||
m_SizeDelta: {x: 510, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4195437168228183862
|
||||
@ -4099,7 +4099,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2365984522426908685, guid: f86e4a833ab26224b81a81d2f6069e99, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 351.79
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2365984522426908685, guid: f86e4a833ab26224b81a81d2f6069e99, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
|
||||
@ -148,7 +148,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 1940
|
||||
ID: 16963
|
||||
FontID: 0
|
||||
TextCfg: []
|
||||
--- !u!1 &2440790000169401958
|
||||
@ -478,7 +478,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 1940
|
||||
ID: 16962
|
||||
FontID: 0
|
||||
TextCfg: []
|
||||
--- !u!1 &3223399217540287398
|
||||
|
||||
BIN
Unity/Assets/Resources/TH1UI/Icon/CommonIcon/QuitMatch.png
Normal file
|
After Width: | Height: | Size: 3.8 KiB |
114
Unity/Assets/Resources/TH1UI/Icon/CommonIcon/QuitMatch.png.meta
Normal file
@ -0,0 +1,114 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 823b3b84577f3e5468c284b139bb7656
|
||||
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:
|
||||
BIN
Unity/Assets/Resources/TH1UI/Icon/CommonIcon/Setting.png
Normal file
|
After Width: | Height: | Size: 4.2 KiB |
114
Unity/Assets/Resources/TH1UI/Icon/CommonIcon/Setting.png.meta
Normal file
@ -0,0 +1,114 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 513992655af11224f947e78da360cc82
|
||||
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:
|
||||
8
Unity/Assets/Resources/TH1UI/UIBottom.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: eab310613637de44a8d0125f9fe890bb
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
After Width: | Height: | Size: 1.6 KiB |
@ -0,0 +1,114 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c09f251071d94ad468d8b59ad5126ae5
|
||||
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:
|
||||
|
After Width: | Height: | Size: 5.4 KiB |
@ -0,0 +1,114 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f88a3a08401e25346bd53b1db93a1145
|
||||
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:
|
||||
BIN
Unity/Assets/Resources/TH1UI/UIBottom/BottomBar_Preview.png
Normal file
|
After Width: | Height: | Size: 1.7 MiB |
114
Unity/Assets/Resources/TH1UI/UIBottom/BottomBar_Preview.png.meta
Normal file
@ -0,0 +1,114 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 365beb428d8f00a4497f0c8880f7274d
|
||||
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:
|
||||
BIN
Unity/Assets/Resources/TH1UI/UIBottom/BottomBar_TechButton.png
Normal file
|
After Width: | Height: | Size: 51 KiB |
@ -0,0 +1,114 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 6455bb2b81c156c4cadfd23c90bc9970
|
||||
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:
|
||||
BIN
Unity/Assets/Resources/TH1UI/UIBottom/BottomBar_TechIcon.png
Normal file
|
After Width: | Height: | Size: 26 KiB |
@ -0,0 +1,114 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b6ea738bbd5107a4f81cd8b5cf9900f9
|
||||
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:
|
||||
@ -56,7 +56,15 @@ namespace TH1_Core.Events
|
||||
EventManager.Subscribe<ShowUIOutsideLoading>(HandleShowUIOutsideLoading);
|
||||
EventManager.Subscribe<HideUIOutsideLoading>(HandleHideUIOutsideLoading);
|
||||
|
||||
|
||||
EventManager.Subscribe<ShowUIBottomBottomBar>(HandleShowUIBottomBottomBar);
|
||||
EventManager.Subscribe<HideUIBottomBottomBar>(HandleHideUIBottomBottomBar);
|
||||
EventManager.Subscribe<UpdateUIBottomBottomBarHeroButtonAvatar>(HandleUpdateUIBottomBottomBarHeroButtonAvatar);
|
||||
EventManager.Subscribe<ExecuteUIBottomBottomBarTechButtonClick>(HandleExecuteUIBottomBottomBarTechButtonClick);
|
||||
EventManager.Subscribe<ExecuteUIBottomBottomBarHeroButtonClick>(HandleExecuteUIBottomBottomBarHeroButtonClick);
|
||||
EventManager.Subscribe<ExecuteUIBottomBottomBarNextButtonClick>(HandleExecuteUIBottomBottomBarNextButtonClick);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -90,6 +98,13 @@ namespace TH1_Core.Events
|
||||
EventManager.Unsubscribe<ShowUIOutsideLoading>(HandleShowUIOutsideLoading);
|
||||
EventManager.Unsubscribe<HideUIOutsideLoading>(HandleHideUIOutsideLoading);
|
||||
|
||||
EventManager.Unsubscribe<ShowUIBottomBottomBar>(HandleShowUIBottomBottomBar);
|
||||
EventManager.Unsubscribe<HideUIBottomBottomBar>(HandleHideUIBottomBottomBar);
|
||||
EventManager.Unsubscribe<UpdateUIBottomBottomBarHeroButtonAvatar>(HandleUpdateUIBottomBottomBarHeroButtonAvatar);
|
||||
EventManager.Unsubscribe<ExecuteUIBottomBottomBarTechButtonClick>(HandleExecuteUIBottomBottomBarTechButtonClick);
|
||||
EventManager.Unsubscribe<ExecuteUIBottomBottomBarHeroButtonClick>(HandleExecuteUIBottomBottomBarHeroButtonClick);
|
||||
EventManager.Unsubscribe<ExecuteUIBottomBottomBarNextButtonClick>(HandleExecuteUIBottomBottomBarNextButtonClick);
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -245,6 +260,47 @@ namespace TH1_Core.Events
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
private void HandleShowUIBottomBottomBar(ShowUIBottomBottomBar evt)
|
||||
{
|
||||
if (UIManager.Instance.UIBottomManager == null) return;
|
||||
UIManager.Instance.UIBottomManager.ShowBottomBar();
|
||||
}
|
||||
|
||||
private void HandleHideUIBottomBottomBar(HideUIBottomBottomBar evt)
|
||||
{
|
||||
if (UIManager.Instance.UIBottomManager == null) return;
|
||||
UIManager.Instance.UIBottomManager.HideBottomBar();
|
||||
}
|
||||
|
||||
private void HandleUpdateUIBottomBottomBarHeroButtonAvatar(UpdateUIBottomBottomBarHeroButtonAvatar evt)
|
||||
{
|
||||
if (UIManager.Instance.UIBottomManager == null) return;
|
||||
UIManager.Instance.UIBottomManager.UpdateBottomBarHeroAvatar();
|
||||
|
||||
}
|
||||
|
||||
private void HandleExecuteUIBottomBottomBarTechButtonClick(ExecuteUIBottomBottomBarTechButtonClick evt)
|
||||
{
|
||||
if (UIManager.Instance.UIBottomManager == null) return;
|
||||
UIManager.Instance.UIBottomManager.ExecuteBottomBarTechButtonClick();
|
||||
|
||||
}
|
||||
|
||||
private void HandleExecuteUIBottomBottomBarHeroButtonClick(ExecuteUIBottomBottomBarHeroButtonClick evt)
|
||||
{
|
||||
if (UIManager.Instance.UIBottomManager == null) return;
|
||||
UIManager.Instance.UIBottomManager.ExecuteBottomBarHeroButtonClick();
|
||||
|
||||
}
|
||||
|
||||
private void HandleExecuteUIBottomBottomBarNextButtonClick(ExecuteUIBottomBottomBarNextButtonClick evt)
|
||||
{
|
||||
if (UIManager.Instance.UIBottomManager == null) return;
|
||||
UIManager.Instance.UIBottomManager.ExecuteBottomBarNextButtonClick();
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@ -88,7 +88,7 @@ namespace TH1_Core.Events
|
||||
|
||||
public struct ShowUIInfoTechTree { public uint non; }
|
||||
public struct HideUIInfoTechTree { public uint non; }
|
||||
|
||||
|
||||
public enum UIGridInfoType {grid,unit,city}
|
||||
public struct ShowUIInfoGridInfo
|
||||
{
|
||||
@ -154,4 +154,15 @@ namespace TH1_Core.Events
|
||||
{
|
||||
public uint non;
|
||||
}
|
||||
|
||||
// ------------------------------------------------ UIBottom 相关的事件 ------------------------------------
|
||||
|
||||
public struct ShowUIBottomBottomBar { public uint non; }
|
||||
public struct HideUIBottomBottomBar { public uint non; }
|
||||
public struct UpdateUIBottomBottomBarHeroButtonAvatar { public uint non; }
|
||||
|
||||
public struct ExecuteUIBottomBottomBarTechButtonClick { public uint non; }
|
||||
public struct ExecuteUIBottomBottomBarHeroButtonClick { public uint non; }
|
||||
public struct ExecuteUIBottomBottomBarNextButtonClick { public uint non; }
|
||||
|
||||
}
|
||||
|
||||
@ -30,7 +30,7 @@ namespace TH1_Core.Managers
|
||||
|
||||
public static string BusyType;
|
||||
// 初始化方法,用于设置初始状态或加载资源
|
||||
public static void OnGameStart()
|
||||
public static void OnMatchStart()
|
||||
{
|
||||
_isBusy = false;
|
||||
_taskQueue.Clear();
|
||||
|
||||
@ -44,7 +44,7 @@ namespace TH1_Core.Managers
|
||||
private MapData _mapData;
|
||||
public GameObject ROUIManager;
|
||||
public TH1_UI.TopBarUI TopBarUI;
|
||||
public BottomBarUI BottomBarUI;
|
||||
//public BottomBarUI BottomBarUI;
|
||||
public GameUI GameUI;
|
||||
public BoardingUI BoardingUI;
|
||||
|
||||
@ -54,7 +54,6 @@ namespace TH1_Core.Managers
|
||||
|
||||
public SettingUI SettingUI;
|
||||
public WinUI WinUI;
|
||||
public MessageUI MessageUI;
|
||||
public RankingUI RankingUI;
|
||||
public DebugUI DebugUI;
|
||||
public GameObject AIPlayingHint;
|
||||
@ -64,6 +63,7 @@ namespace TH1_Core.Managers
|
||||
public UIInfoManager UIInfoManager;
|
||||
public UINotifyManager UINotifyManager;
|
||||
public UIOutsideManager UIOutsideManager;
|
||||
public UIBottomManager UIBottomManager;
|
||||
|
||||
public UIManager()
|
||||
{
|
||||
@ -88,11 +88,14 @@ namespace TH1_Core.Managers
|
||||
UIResourceController.Instance.SetUIRoot(UIRootType.InfoUI,ROUIManager.transform.Find("Inside/Info"));
|
||||
UIResourceController.Instance.SetUIRoot(UIRootType.TipUI,ROUIManager.transform.Find("Inside/Tip"));
|
||||
UIResourceController.Instance.SetUIRoot(UIRootType.NotifyUI,ROUIManager.transform.Find("Inside/Notify"));
|
||||
UIResourceController.Instance.SetUIRoot(UIRootType.BottomUI,ROUIManager.transform.Find("Inside/Bottom"));
|
||||
UIResourceController.Instance.SetUIRoot(UIRootType.OutsideUI,ROUIManager.transform.Find("Outside"));
|
||||
|
||||
|
||||
UIInfoManager = new UIInfoManager();
|
||||
UINotifyManager = new UINotifyManager();
|
||||
UIOutsideManager = new UIOutsideManager();
|
||||
UIBottomManager = new UIBottomManager();
|
||||
|
||||
|
||||
//step #3 设置其他
|
||||
@ -105,11 +108,11 @@ namespace TH1_Core.Managers
|
||||
ViewControllerManager.OnMatchStart();
|
||||
GameUI.Init();
|
||||
UIOutsideManager.Init();
|
||||
|
||||
|
||||
UIBottomManager.Init();
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
public bool ShowLoading()
|
||||
{
|
||||
float loadingTime = 2f;
|
||||
@ -127,30 +130,35 @@ namespace TH1_Core.Managers
|
||||
}
|
||||
|
||||
//每一局游戏开始前,刷新与局内游戏相关的UI
|
||||
public void GameInit()
|
||||
public void OnMatchStart()
|
||||
{
|
||||
WinUI = new WinUI();
|
||||
MessageUI = new MessageUI(_main, _mapData);
|
||||
RankingUI = new RankingUI();
|
||||
TopBarUI = new TH1_UI.TopBarUI(_main,_mapData);
|
||||
BottomBarUI = new BottomBarUI(_main);
|
||||
//BottomBarUI = new BottomBarUI(_main);
|
||||
//CenterMessageUI = new CenterMessageUI(_main,_mapData);
|
||||
DebugUI = new DebugUI();
|
||||
_gameInitReady = true;
|
||||
ViewControllerManager.OnMatchStart();
|
||||
//TODO UI这边全部要更新GameInit
|
||||
//UIInfoManager.GameInit();
|
||||
|
||||
//TODO UI这边全部要更新MatchStart
|
||||
UIBottomManager.OnMatchStart();
|
||||
UIInfoManager.OnMatchStart();
|
||||
}
|
||||
|
||||
//TODO 要启用MatchEnd的生命周期
|
||||
public void OnMatchEnd()
|
||||
{
|
||||
UIBottomManager.OnMatchEnd();
|
||||
}
|
||||
|
||||
public void Update()
|
||||
{
|
||||
if(_gameInitReady)
|
||||
{
|
||||
//step #2
|
||||
BottomBarUI?.Update();
|
||||
//BottomBarUI?.Update();
|
||||
TopBarUI?.Update();
|
||||
WinUI?.Update();
|
||||
MessageUI?.Update();
|
||||
RankingUI?.Update();
|
||||
DebugUI?.Update();
|
||||
|
||||
|
||||
@ -10,6 +10,7 @@ using System.Collections.Generic;
|
||||
using Logic.Action;
|
||||
using Logic.AI;
|
||||
using MemoryPack;
|
||||
using TH1_Core.Events;
|
||||
using TH1_Core.Managers;
|
||||
using TH1_Logic.Core;
|
||||
using TH1_Logic.HeroTask;
|
||||
@ -1345,10 +1346,12 @@ namespace RuntimeData
|
||||
public bool UpdateHero(MapData map,PlayerData player,UnitFullType newType)
|
||||
{
|
||||
if (!HasHero(newType.GiantType)) return false;
|
||||
//TODO 临时写法
|
||||
|
||||
//通知UI界面 更新heroButton按钮
|
||||
if (this == Main.MapData.PlayerMap.SelfPlayerData.PlayerHeroData)
|
||||
{
|
||||
UIManager.Instance.BottomBarUI.UpdateHeroButtonSprite();
|
||||
EventManager.Publish(new UpdateUIBottomBottomBarHeroButtonAvatar());
|
||||
//UIManager.Instance.BottomBarUI.UpdateHeroButtonSprite();
|
||||
}
|
||||
for(int i =0;i < HeroCount;i++)
|
||||
if (HeroList[i].GiantType == newType.GiantType)
|
||||
|
||||
@ -170,9 +170,9 @@ namespace TH1_Logic.Core
|
||||
//step #2 视觉三兄弟 初始化maprender 初始化UIManager 初始化演出管理器
|
||||
//MapRenderer.Dispose();
|
||||
//MapRenderer.Initialize(this,MapData);
|
||||
MapRenderer.OnGameStart(this,MapData);
|
||||
UIManager.Instance.GameInit();
|
||||
PresentationManager.OnGameStart();
|
||||
MapRenderer.OnMatchStart(this,MapData);
|
||||
UIManager.Instance.OnMatchStart();
|
||||
PresentationManager.OnMatchStart();
|
||||
|
||||
//step #3 初始化所有Logic
|
||||
InputLogic = new InputLogic(this,MapData);
|
||||
@ -265,7 +265,7 @@ namespace TH1_Logic.Core
|
||||
//TODO 和文波确认流程
|
||||
MapRenderer.Dispose();
|
||||
MapRenderer.Initialize(this,MapData);
|
||||
UIManager.Instance.GameInit();
|
||||
UIManager.Instance.OnMatchStart();
|
||||
|
||||
//初始化交互相关的logic
|
||||
InputLogic = new InputLogic(this,MapData);
|
||||
@ -340,7 +340,7 @@ namespace TH1_Logic.Core
|
||||
//清空MapRenderer,然后重新初始化
|
||||
MapRenderer.Dispose();
|
||||
MapRenderer.Initialize(this,MapData);
|
||||
UIManager.Instance.GameInit();
|
||||
UIManager.Instance.OnMatchStart();
|
||||
//初始化交互相关的logic
|
||||
InputLogic = new InputLogic(this,MapData);
|
||||
MapInteractionLogic = new MapInteraction(this,MapData);
|
||||
@ -375,7 +375,7 @@ namespace TH1_Logic.Core
|
||||
//清空MapRenderer,然后重新初始化
|
||||
MapRenderer.Dispose();
|
||||
MapRenderer.Initialize(this,MapData);
|
||||
UIManager.Instance.GameInit();
|
||||
UIManager.Instance.OnMatchStart();
|
||||
//初始化交互相关的logic
|
||||
InputLogic = new InputLogic(this,MapData);
|
||||
MapInteractionLogic = new MapInteraction(this,MapData);
|
||||
|
||||
@ -114,7 +114,8 @@ namespace Logic
|
||||
|
||||
if (Input.GetKeyDown(KeyCode.E))
|
||||
{
|
||||
SimulateButtonClick(UIManager.Instance.BottomBarUI.NextTurnButton);
|
||||
EventManager.Publish(new ExecuteUIBottomBottomBarNextButtonClick());
|
||||
//SimulateButtonClick(UIManager.Instance.BottomBarUI.NextTurnButton);
|
||||
}
|
||||
|
||||
if (Input.GetKeyDown(KeyCode.BackQuote))
|
||||
|
||||
@ -639,6 +639,19 @@ namespace Logic
|
||||
else
|
||||
MovementCostMap[i, j] = -1;
|
||||
|
||||
//特殊处理MORIYAKNIGHTMOVE
|
||||
if (unitData.GetSkill(SkillType.MORIYAKNIGHTMOVE, out var _))
|
||||
{
|
||||
//如果是山脉且没有城市在上面
|
||||
if (targetGridData.Terrain == TerrainType.Land &&
|
||||
!(targetGridData.Feature == TerrainFeature.Mountain || targetGridData.CityOnGrid(mapData, out var _)))
|
||||
{
|
||||
//不是山或者城市中心的陆地,不可达
|
||||
MovementCostMap[i, j] = -1;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (MovementCostMap[i, j] == 0)
|
||||
{
|
||||
Debug.Log("Fatal Error !!!!");
|
||||
@ -837,6 +850,21 @@ namespace Logic
|
||||
}
|
||||
}
|
||||
|
||||
// MORIYAKNIGHTMOVE 技能拓展(主要是消除早苗的英雄)
|
||||
if (unitData.GetSkill(SkillType.MORIYAKNIGHTMOVE, out var _))
|
||||
{
|
||||
for (int i = 0; i < width; i++)
|
||||
for (int j = 0; j < height; j++)
|
||||
if (mapData.GridMap.GetGridDataByV2(new Vector2(i, j), out var grid) &&
|
||||
grid.Terrain == TerrainType.Land &&
|
||||
!(grid.Feature == TerrainFeature.Mountain || grid.CityOnGrid(mapData,out var _)
|
||||
))
|
||||
{
|
||||
SanaeMap[i,j] = false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -141,7 +141,7 @@ namespace TH1Renderer
|
||||
//当退出游戏或者结束游戏的时候出发,用来清理一些视觉对象
|
||||
|
||||
//InGame游戏开始的生命周期
|
||||
public static void OnGameStart(Main main, MapData mapData)
|
||||
public static void OnMatchStart(Main main, MapData mapData)
|
||||
{
|
||||
Dispose();
|
||||
Initialize(main,mapData);
|
||||
|
||||
@ -30,7 +30,6 @@ public class BottomBarUI
|
||||
public Button RankingButton;
|
||||
public Button TechTreeButton;
|
||||
public Button NextTurnButton;
|
||||
public Button MessageButton; // ← 新增按钮字段
|
||||
public Button HeroButton;
|
||||
public Transform QuitHint;
|
||||
public Transform TutorPanel;
|
||||
@ -78,7 +77,6 @@ public class BottomBarUI
|
||||
RankingButton = ROBottomBarUI.transform.Find("RankingButton").GetComponent<Button>();
|
||||
TechTreeButton = ROBottomBarUI.transform.Find("TechTreeButton").GetComponent<Button>();
|
||||
NextTurnButton = ROBottomBarUI.transform.Find("NextTurnButton").GetComponent<Button>();
|
||||
MessageButton = ROBottomBarUI.transform.Find("MessageButton").GetComponent<Button>(); // ← 新增按钮获取
|
||||
HeroButton = ROBottomBarUI.transform.Find("HeroButton").GetComponent<Button>();
|
||||
NetInfo = ROBottomBarUI.transform.Find("NetInfo");
|
||||
GameStartInit();
|
||||
@ -150,8 +148,6 @@ public class BottomBarUI
|
||||
TechTreeButton.onClick.AddListener(OnTechTreeClicked);
|
||||
NextTurnButton.onClick.RemoveAllListeners();
|
||||
NextTurnButton.onClick.AddListener(OnNextTurnClicked);
|
||||
MessageButton.onClick.RemoveAllListeners();
|
||||
MessageButton.onClick.AddListener(OnMessageClicked); // ← 新增点击监听
|
||||
|
||||
HeroButton.onClick.RemoveAllListeners();
|
||||
HeroButton.onClick.AddListener(OnHeroButtonClicked);
|
||||
@ -349,11 +345,6 @@ public class BottomBarUI
|
||||
// 单机或者是房主直接切
|
||||
else Main.PlayerLogic.EndPlayerTurn(Main.MapData, Main.MapData.PlayerMap.SelfPlayerId);
|
||||
}
|
||||
|
||||
private void OnMessageClicked()
|
||||
{
|
||||
UIManager.Instance.MessageUI.NeedShow = !UIManager.Instance.MessageUI.NeedShow;
|
||||
}
|
||||
|
||||
private void OnHeroButtonClicked()
|
||||
{
|
||||
|
||||
8
Unity/Assets/Scripts/TH1_UI/Controller/Bottom.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 36f08426904ad724ba54df6cd7324fce
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -0,0 +1,96 @@
|
||||
// 文件位置建议: Assets/Scripts/TH1_UI/Controller/UIAnnounceMajorEventController.cs
|
||||
|
||||
using TH1_Core.Events;
|
||||
using TH1_UI.Controller.Base;
|
||||
using TH1_UI.View.Bottom;
|
||||
using UnityEngine;
|
||||
|
||||
// 确保这里引用了View脚本的命名空间
|
||||
|
||||
namespace TH1_UI.Controller.Bottom
|
||||
{
|
||||
public class UIBottomBottomBarController : ViewController<UIBottomBottomBarView> // 泛型参数是对应的View脚本
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// ✅ 【新增】一个空的构造函数,以满足 ViewControllerManager._CreateView 的 new() 泛型约束。
|
||||
/// </summary>
|
||||
public UIBottomBottomBarController() { }
|
||||
|
||||
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 ShowUIBottomBottomBar evt)
|
||||
{
|
||||
// 使用接收到的数据设置UI内容
|
||||
if (WindowScript != null)
|
||||
{
|
||||
WindowScript.SetContent();
|
||||
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// 如果没有参数或参数类型不符,可以提供默认内容或打印警告
|
||||
Debug.LogWarning("[UIInfoTechTree] Opened without valid parameters.");
|
||||
if (WindowScript != null)
|
||||
{
|
||||
|
||||
//WindowScript.SetContent("警告", "内容未提供");
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
public override bool Close()
|
||||
{
|
||||
WindowScript.CloseView();
|
||||
return base.Close();
|
||||
}
|
||||
|
||||
//用于刷新heroButton的视觉
|
||||
public void UpdateHeroAvatar()
|
||||
{
|
||||
WindowScript.UpdateHeroButtonAvatar();
|
||||
}
|
||||
|
||||
public void ExecuteTechButtonClick()
|
||||
{
|
||||
WindowScript.ExecuteButtonClick(WindowScript.TechButton);
|
||||
}
|
||||
|
||||
public void ExecuteHeroButtonClick()
|
||||
{
|
||||
WindowScript.ExecuteButtonClick(WindowScript.HeroButton);
|
||||
}
|
||||
public void ExecuteNextButtonClick()
|
||||
{
|
||||
WindowScript.ExecuteButtonClick(WindowScript.NextButton);
|
||||
}
|
||||
|
||||
void _OnBtnCloseClick()
|
||||
{
|
||||
Close();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 74eaa83e8180e6b45a3066eb7b2e31ef
|
||||
guid: 3569321a103300849aae17e26a2bc16c
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
139
Unity/Assets/Scripts/TH1_UI/Core/UIBottomManager.cs
Normal file
@ -0,0 +1,139 @@
|
||||
|
||||
using System;
|
||||
using TH1_Core.Events;
|
||||
using TH1_Core.Managers;
|
||||
using TH1_UI.Controller.Bottom;
|
||||
using TH1_UI.Controller.Info;
|
||||
|
||||
namespace TH1_UI.Core
|
||||
{
|
||||
|
||||
/*public class UIInfoTask
|
||||
{
|
||||
private readonly IViewControllerInterface _viewController;
|
||||
private readonly object _data; // 用于传递给UI的数据,可以是任何类型
|
||||
private Action _onCompleteCallback; // 保存来自 PresentationManager 的完成回调
|
||||
private bool _callbackRegistered = false;
|
||||
public IViewControllerInterface ViewController => _viewController;
|
||||
/// <summary>
|
||||
/// 创建一个UI显示任务。
|
||||
/// </summary>
|
||||
/// <param name="viewController">要显示的UI的控制器实例。</param>
|
||||
/// <param name="data">可选,需要传递给UI的数据(例如,包含标题和内容的自定义类或元组)。</param>
|
||||
public UIInfoTask(IViewControllerInterface viewController, object data = null)
|
||||
{
|
||||
if (viewController == null)
|
||||
{
|
||||
throw new ArgumentNullException(nameof(viewController), "UISequencerTask cannot be created with a null ViewController.");
|
||||
}
|
||||
_viewController = viewController;
|
||||
_data = data;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 执行任务:打开UI,并等待其关闭。
|
||||
/// </summary>
|
||||
public Type GetControllerType()
|
||||
{
|
||||
return _viewController.GetType();
|
||||
}
|
||||
public void Execute(Action onComplete)
|
||||
{
|
||||
// 1. 保存 PresentationManager 的完成回调
|
||||
_onCompleteCallback = onComplete;
|
||||
// 添加调试日志
|
||||
//Debug.Log($"[TASK] Execute: {_viewController.Name}. Subscribing 'OnViewClosed'. Callback is currently '{(object)_viewController.OnClosedCallback ?? "null"}'.");
|
||||
// 2. 注册自己的回调到 ViewController 的关闭事件上
|
||||
_viewController.OnClosedCallback += OnViewClosed;
|
||||
_callbackRegistered = true;
|
||||
// 添加调试日志
|
||||
//Debug.Log($"[TASK] After Subscribe: {_viewController.Name}. Callback is now '{(object)_viewController.OnClosedCallback ?? "null"}'.");
|
||||
|
||||
// 3. 打开界面
|
||||
if (_data != null)
|
||||
_viewController.OpenWithParam(_data);
|
||||
else
|
||||
_viewController.Open();
|
||||
}
|
||||
private void OnViewClosed()
|
||||
{
|
||||
// step #1 在通知前,立刻注销自己的回调
|
||||
if (_callbackRegistered)
|
||||
{
|
||||
_viewController.OnClosedCallback -= OnViewClosed;
|
||||
_callbackRegistered = false;
|
||||
}
|
||||
//_viewController.OnClosedCallback -= OnViewClosed;
|
||||
|
||||
// step #2. 通知 PresentationManager 任务已完成
|
||||
_onCompleteCallback?.Invoke();
|
||||
}
|
||||
|
||||
public void Close() { _viewController.Close(); }
|
||||
|
||||
}*/
|
||||
|
||||
public class UIBottomManager
|
||||
{
|
||||
|
||||
private UIBottomBottomBarController _bottomBarController;
|
||||
//private UIBottomBottomBarController _bottomBarController;//ranking
|
||||
//private UIBottomBottomBarController _bottomBarController;//message
|
||||
//private UIBottomBottomBarController _bottomBarController;//history
|
||||
|
||||
|
||||
|
||||
// 初始化方法,用于设置初始状态或加载资源
|
||||
public void Init()
|
||||
{
|
||||
//Step #1 初始化Controller
|
||||
_bottomBarController = ViewControllerManager.UIBottomBottomBarController;
|
||||
|
||||
}
|
||||
|
||||
public void OnMatchStart()
|
||||
{
|
||||
_bottomBarController.Open();
|
||||
}
|
||||
|
||||
public void OnMatchEnd()
|
||||
{
|
||||
_bottomBarController.Close();
|
||||
}
|
||||
|
||||
public void ShowBottomBar()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public void HideBottomBar()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public static void Update()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public void UpdateBottomBarHeroAvatar()
|
||||
{
|
||||
_bottomBarController.UpdateHeroAvatar();
|
||||
}
|
||||
|
||||
public void ExecuteBottomBarTechButtonClick()
|
||||
{
|
||||
_bottomBarController.ExecuteTechButtonClick();
|
||||
}
|
||||
public void ExecuteBottomBarHeroButtonClick()
|
||||
{
|
||||
_bottomBarController.ExecuteHeroButtonClick();
|
||||
}
|
||||
public void ExecuteBottomBarNextButtonClick()
|
||||
{
|
||||
_bottomBarController.ExecuteNextButtonClick();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
11
Unity/Assets/Scripts/TH1_UI/Core/UIBottomManager.cs.meta
Normal file
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: bbd7bcfb07f2bd54a8a1b1ffdc7d6898
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -94,6 +94,11 @@ namespace TH1_UI.Core
|
||||
{
|
||||
}
|
||||
|
||||
public void OnMatchStart()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public void StartNewTask(UIInfoTask task)
|
||||
{
|
||||
if (_task != null) _task.Close();
|
||||
|
||||
@ -26,6 +26,8 @@ namespace TH1_UI.Core
|
||||
public static readonly string ViewOutsideMultiplay = "UIOutsideMultiplay";
|
||||
public static readonly string ViewOutsideSelect = "UIOutsideSelect";
|
||||
public static readonly string ViewOutsideLoading = "UIOutsideLoading";
|
||||
|
||||
public static readonly string ViewBottomBottomBar = "UIBottomBottomBar";
|
||||
|
||||
}
|
||||
}
|
||||
@ -4,6 +4,7 @@ using System.Collections.Generic;
|
||||
using TH1_Core.Managers;
|
||||
using TH1_UI.Controller.Announce;
|
||||
using TH1_UI.Controller.Base;
|
||||
using TH1_UI.Controller.Bottom;
|
||||
using TH1_UI.Controller.Info;
|
||||
using TH1_UI.Controller.Interaction;
|
||||
using TH1_UI.Controller.Notify;
|
||||
@ -49,7 +50,10 @@ namespace TH1_UI.Core
|
||||
public static UIOutsideSelectController UIOutsideSelectController { get { return _outsideSelectController; } }
|
||||
public static UIOutsideLoadingController UIOutsideLoadingController { get { return _outsideLoadingController; } }
|
||||
|
||||
|
||||
// ================================================= Bottom ================================================================
|
||||
|
||||
public static UIBottomBottomBarController UIBottomBottomBarController { get { return _bottomBottomBarController; } }
|
||||
|
||||
public static void OnMatchStart()
|
||||
{
|
||||
//_blankTouchArea = UnityAssisstant.CreateComponent<UIBlankTouchArea>(GlobalGameObject.Instance.UIBlankTouch);
|
||||
@ -73,12 +77,12 @@ namespace TH1_UI.Core
|
||||
{
|
||||
|
||||
// ================================================= Announce ================================================================
|
||||
_announceMajorEventController = _CreateView<UIAnnounceMajorEventController>("Announce", UIResourceName.ViewAnnounceMajorEvent, ViewDestroyDomain.None,UIRootType.PresentationUI);
|
||||
_announceDiplomacyController = _CreateView<UIAnnounceDiplomacyController>("Announce", UIResourceName.ViewAnnounceDiplomacy, ViewDestroyDomain.None,UIRootType.PresentationUI);
|
||||
_announceMajorEventController = _CreateView<UIAnnounceMajorEventController>("Presentation/Announce", UIResourceName.ViewAnnounceMajorEvent, ViewDestroyDomain.None,UIRootType.PresentationUI);
|
||||
_announceDiplomacyController = _CreateView<UIAnnounceDiplomacyController>("Presentation/Announce", UIResourceName.ViewAnnounceDiplomacy, ViewDestroyDomain.None,UIRootType.PresentationUI);
|
||||
|
||||
// ================================================= Interaction ================================================================
|
||||
_interactionCityLevelupController = _CreateView<UIInteractionCityLevelupController>("Interaction", UIResourceName.ViewInteractionCityUpgrade, ViewDestroyDomain.None,UIRootType.PresentationUI);
|
||||
_interactionDiplomacyOfferAllyController = _CreateView<UIInteractionDiplomacyOfferAllyController>("Interaction",UIResourceName.ViewInteractionDiplomacyOfferAlly, ViewDestroyDomain.None,UIRootType.PresentationUI);
|
||||
_interactionCityLevelupController = _CreateView<UIInteractionCityLevelupController>("Presentation/Interaction", UIResourceName.ViewInteractionCityUpgrade, ViewDestroyDomain.None,UIRootType.PresentationUI);
|
||||
_interactionDiplomacyOfferAllyController = _CreateView<UIInteractionDiplomacyOfferAllyController>("Presentation/Interaction",UIResourceName.ViewInteractionDiplomacyOfferAlly, ViewDestroyDomain.None,UIRootType.PresentationUI);
|
||||
|
||||
// ================================================= Info ================================================================
|
||||
_infoDiplomacyController = _CreateView<UIInfoDiplomacyController>("Info", UIResourceName.ViewInfoDiplomacy, ViewDestroyDomain.None,UIRootType.InfoUI);
|
||||
@ -94,6 +98,9 @@ namespace TH1_UI.Core
|
||||
_outsideSelectController = _CreateView<UIOutsideSelectController>("Outside", UIResourceName.ViewOutsideSelect, ViewDestroyDomain.None,UIRootType.OutsideUI);
|
||||
_outsideLoadingController = _CreateView<UIOutsideLoadingController>("Outside", UIResourceName.ViewOutsideLoading, ViewDestroyDomain.None,UIRootType.OutsideUI);
|
||||
|
||||
// ================================================= Bottom ================================================================
|
||||
_bottomBottomBarController = _CreateView<UIBottomBottomBarController>("Bottom", UIResourceName.ViewBottomBottomBar, ViewDestroyDomain.None,UIRootType.BottomUI);
|
||||
|
||||
// ================================================= 通用 ================================================================
|
||||
|
||||
|
||||
@ -119,6 +126,9 @@ namespace TH1_UI.Core
|
||||
// ================================================= Outside ================================================================
|
||||
//_outsideMultiplayController = _CreateView<UIOutsideMultiplayController>("Outside", UIResourceName.ViewOutsideMultiplay, ViewDestroyDomain.None,UIRootType.OutsideUI);
|
||||
|
||||
// ================================================= Bottom ================================================================
|
||||
//_outsideMultiplayController = _CreateView<UIOutsideMultiplayController>("Bottom", UIResourceName.ViewBottomBottomBar, ViewDestroyDomain.None,UIRootType.BottomUI);
|
||||
|
||||
// ================================================= 通用 ================================================================
|
||||
}
|
||||
|
||||
@ -219,6 +229,8 @@ namespace TH1_UI.Core
|
||||
private static UIOutsideSelectController _outsideSelectController = null;
|
||||
private static UIOutsideLoadingController _outsideLoadingController = null;
|
||||
|
||||
private static UIBottomBottomBarController _bottomBottomBarController = null;
|
||||
|
||||
static Dictionary<string, IViewControllerInterface> _viewDict = new Dictionary<string, IViewControllerInterface>();
|
||||
|
||||
/*
|
||||
|
||||
@ -1,85 +0,0 @@
|
||||
using UnityEngine;
|
||||
using Logic;
|
||||
using RuntimeData;
|
||||
using UnityEngine.UI;
|
||||
using Animancer;
|
||||
using Logic.CrashSight;
|
||||
using TMPro;
|
||||
using Logic.Multilingual;
|
||||
using TH1_Core.Managers;
|
||||
using TH1_Logic.Core;
|
||||
using UI;
|
||||
|
||||
public class MessageUI
|
||||
{
|
||||
private Main _main;
|
||||
private MapData _mapData;
|
||||
public GameObject ROMessageUI;
|
||||
|
||||
public bool NeedShow = false; // 外部可设置,控制显示状态
|
||||
|
||||
private bool _isShowing = false; // 当前逻辑状态
|
||||
private bool _isAnimating = false; // 是否正在播放动画
|
||||
private float _fadeDuration = 0.2f;
|
||||
|
||||
public MessageUI(Main main, MapData mapData)
|
||||
{
|
||||
_main = main;
|
||||
_mapData = mapData;
|
||||
ROMessageUI = UIManager.Instance.ROUIManager.transform.Find("MessagePanel").gameObject;
|
||||
ROMessageUI.gameObject.SetActive(false);
|
||||
}
|
||||
|
||||
public void Update()
|
||||
{
|
||||
if (_isAnimating) return;
|
||||
|
||||
if (NeedShow && !ROMessageUI.activeSelf)
|
||||
{
|
||||
Show();
|
||||
}
|
||||
else if (!NeedShow && ROMessageUI.activeSelf)
|
||||
{
|
||||
Hide();
|
||||
}
|
||||
}
|
||||
|
||||
public void Show()
|
||||
{
|
||||
if (_isShowing || _isAnimating) return;
|
||||
|
||||
_isShowing = true;
|
||||
_isAnimating = true;
|
||||
ROMessageUI.SetActive(true);
|
||||
|
||||
var animancer = ROMessageUI.GetComponent<AnimancerComponent>();
|
||||
var fadeIn = Resources.Load<AnimationClip>("Animations/UI/MessagePanelFadeIn");
|
||||
if (fadeIn != null)
|
||||
{
|
||||
animancer.Play(fadeIn);
|
||||
}
|
||||
|
||||
Timer.Instance.TimerRegister(ROMessageUI, () => { _isAnimating = false; }, _fadeDuration,"MessageUI_Show");
|
||||
}
|
||||
|
||||
public void Hide()
|
||||
{
|
||||
if (!_isShowing || _isAnimating) return;
|
||||
|
||||
_isShowing = false;
|
||||
_isAnimating = true;
|
||||
|
||||
var animancer = ROMessageUI.GetComponent<AnimancerComponent>();
|
||||
var fadeOut = Resources.Load<AnimationClip>("Animations/UI/MessagePanelFadeOut");
|
||||
if (fadeOut != null)
|
||||
{
|
||||
animancer.Play(fadeOut);
|
||||
}
|
||||
|
||||
Timer.Instance.TimerRegister(ROMessageUI, () =>
|
||||
{
|
||||
ROMessageUI.SetActive(false);
|
||||
_isAnimating = false;
|
||||
}, _fadeDuration,"MessageUI_Hide");
|
||||
}
|
||||
}
|
||||
8
Unity/Assets/Scripts/TH1_UI/View/Bottom.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 03cbd3d0ae7b3794f8b0d582949014e6
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
147
Unity/Assets/Scripts/TH1_UI/View/Bottom/UIBottomBottomBarView.cs
Normal file
@ -0,0 +1,147 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Animancer;
|
||||
using Logic;
|
||||
using Logic.Action;
|
||||
using Logic.Audio;
|
||||
using Logic.CrashSight;
|
||||
using Logic.Multilingual;
|
||||
using RuntimeData;
|
||||
using TH1_Core.Events;
|
||||
using TH1_Core.Managers;
|
||||
using TH1_Logic.Core;
|
||||
using TH1_Logic.Net;
|
||||
using TH1_Logic.Steam;
|
||||
using TH1_UI.Components;
|
||||
using TH1_UI.HintUI;
|
||||
using TH1Renderer;
|
||||
using TH1Resource;
|
||||
using TMPro;
|
||||
using UI.HintUI;
|
||||
using Unity.VisualScripting;
|
||||
using UnityEngine;
|
||||
using UnityEngine.EventSystems;
|
||||
using UnityEngine.UI;
|
||||
|
||||
namespace TH1_UI.View.Bottom
|
||||
{
|
||||
public class UIBottomBottomBarView : Base.View
|
||||
{
|
||||
//public Button closeButton;
|
||||
public ViDelegateAssisstant.Dele OnBtnCloseClick;
|
||||
|
||||
public Button TechButton;
|
||||
public Button HeroButton;
|
||||
public Button NextButton;
|
||||
public GameObject HeroButtonIconHint;
|
||||
public GameObject HeroButtonTextHint;
|
||||
public Image HeroButtonAvatar;
|
||||
public Button SettingButton;
|
||||
public Button QuitButton;
|
||||
public Button SLButton;
|
||||
public Transform NetInfo;
|
||||
|
||||
protected override void OnInit()
|
||||
{
|
||||
base.OnInit();
|
||||
//closeButton.onClick.RemoveAllListeners();
|
||||
//closeButton.onClick.AddListener(() => { OnBtnCloseClick.Invoke(); });
|
||||
//CheckPanel.InitStart(RefreshStatus);
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
//通常一局只会set一次,每次都是完全清空,然后绑定新的一个对局的按钮
|
||||
public void SetContent()
|
||||
{
|
||||
QuitButton.onClick.RemoveAllListeners();
|
||||
QuitButton.onClick.AddListener(OnQuitButtonClicked);
|
||||
SettingButton.onClick.RemoveAllListeners();
|
||||
SettingButton.onClick.AddListener(OnSettingButtonClicked);
|
||||
TechButton.onClick.RemoveAllListeners();
|
||||
TechButton.onClick.AddListener(OnTechButtonClicked);
|
||||
NextButton.onClick.RemoveAllListeners();
|
||||
NextButton.onClick.AddListener(OnNextButtonClicked);
|
||||
HeroButton.onClick.RemoveAllListeners();
|
||||
HeroButton.onClick.AddListener(OnHeroButtonClicked);
|
||||
SLButton.onClick.RemoveAllListeners();
|
||||
SLButton.onClick.AddListener(OnSLButtonClicked);
|
||||
UpdateHeroButtonAvatar();
|
||||
}
|
||||
|
||||
private void OnQuitButtonClicked()
|
||||
{
|
||||
if(Main.MapData?.Net.Mode == NetMode.Multi)
|
||||
LobbyManager.Instance.Lobby?.LeaveLobby();
|
||||
MapRenderer.Instance.OnGameClosed();
|
||||
OnBtnCloseClick.Invoke();
|
||||
UIManager.Instance.GameUI.MainUI.NeedShow = true;
|
||||
Main.Instance.GameLogic.ChangeState(GameState.Menu);
|
||||
|
||||
}
|
||||
|
||||
private void OnSettingButtonClicked()
|
||||
{
|
||||
UIManager.Instance.SettingUI.NeedShow = !UIManager.Instance.SettingUI.NeedShow;
|
||||
}
|
||||
|
||||
private void OnTechButtonClicked()
|
||||
{
|
||||
EventManager.Publish(new ShowUIInfoTechTree(){non = 0});
|
||||
Main.Instance.MapInteractionLogic.CancelAllHighlight();
|
||||
}
|
||||
|
||||
private void OnHeroButtonClicked()
|
||||
{
|
||||
EventManager.Publish(new ShowUIInfoHero(){non = 0});
|
||||
}
|
||||
|
||||
private void OnNextButtonClicked()
|
||||
{
|
||||
Main.Instance.MapInteractionLogic.CancelAllHighlight();
|
||||
if (Main.MapData.Net.Mode == NetMode.Multi && !LobbyManager.Instance.Lobby.IsLobbyOwner())
|
||||
{
|
||||
GameNetSender.Instance.TurnEndConfirm();
|
||||
}
|
||||
// 单机或者是房主直接切
|
||||
else Main.PlayerLogic.EndPlayerTurn(Main.MapData, Main.MapData.PlayerMap.SelfPlayerId);
|
||||
}
|
||||
|
||||
private void OnSLButtonClicked()
|
||||
{
|
||||
if (Main.MapData == null) return;
|
||||
if (!Main.MapData.CurPlayer.IsSelfPlayer()) return;
|
||||
if (Main.MapData.Net.Mode != NetMode.Single) return;
|
||||
Main.Instance.GameLogic.ChangeState(GameState.Menu);
|
||||
UIManager.Instance.GameUI.MainUI.ShowLoadingAndResumeGame(false);
|
||||
}
|
||||
|
||||
public void CloseView()
|
||||
{
|
||||
AudioManager.Instance.StopMusic();
|
||||
}
|
||||
|
||||
public void UpdateHeroButtonAvatar()
|
||||
{
|
||||
bool newHero = Main.MapData.PlayerMap.SelfPlayerData.PlayerHeroData.GetHeroButtonHint();
|
||||
HeroButtonTextHint.SetActive(newHero);
|
||||
HeroButtonIconHint.SetActive(newHero);
|
||||
|
||||
HeroButtonAvatar.sprite = Main.MapData.PlayerMap.SelfPlayerData.PlayerHeroData.GetHeroButtonSprite();
|
||||
}
|
||||
|
||||
|
||||
public void ExecuteButtonClick(Button button)
|
||||
{
|
||||
var pointer = new PointerEventData(EventSystem.current);
|
||||
var go = button.gameObject;
|
||||
|
||||
ExecuteEvents.Execute(go, pointer, ExecuteEvents.pointerDownHandler);
|
||||
ExecuteEvents.Execute(go, pointer, ExecuteEvents.pointerUpHandler);
|
||||
button.onClick.Invoke();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 11501ddd301138546a00540da54c5beb
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -4,6 +4,7 @@ using Logic.Audio;
|
||||
using Logic.Multilingual;
|
||||
using NUnit.Framework.Constraints;
|
||||
using RuntimeData;
|
||||
using TH1_Core.Events;
|
||||
using TH1_Core.Managers;
|
||||
using TH1_Logic.Action;
|
||||
using TH1_Logic.Core;
|
||||
@ -213,7 +214,8 @@ namespace TH1_UI.View.Info
|
||||
if (action.CompleteExecute(actionParams))
|
||||
{
|
||||
SetContent();
|
||||
UIManager.Instance.BottomBarUI.UpdateHeroButtonSprite();
|
||||
EventManager.Publish(new UpdateUIBottomBottomBarHeroButtonAvatar());
|
||||
//UIManager.Instance.BottomBarUI.UpdateHeroButtonSprite();
|
||||
OnBtnCloseClick();
|
||||
}
|
||||
//heroData.AddHero(_choiceGiantType);
|
||||
|
||||