【UI动静分离】提交动静分离代码
chenyuqi
parent
6385518c5e
commit
458bcafc59
|
|
@ -235,7 +235,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 160360350696043778}
|
||||
- component: {fileID: 7140296051787149039}
|
||||
- component: {fileID: 5955057362195124525}
|
||||
- component: {fileID: 8885595467703245960}
|
||||
m_Layer: 5
|
||||
m_Name: UI_LevelFightCarHD_1
|
||||
m_TagString: Untagged
|
||||
|
|
@ -275,7 +275,7 @@ CanvasGroup:
|
|||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!114 &5955057362195124525
|
||||
--- !u!114 &8885595467703245960
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -284,7 +284,7 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 835525067761113891}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6f7634e064d24fa6a25af58cb14c64d6, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: c08d3c3d52b644209ef849a67a185a9b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &864957562341473951
|
||||
|
|
@ -622,7 +622,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 8367020018645306190}
|
||||
- component: {fileID: 8510963642231678814}
|
||||
- component: {fileID: 8573803044562666523}
|
||||
m_Layer: 5
|
||||
m_Name: UIHerosHeadIteamCD
|
||||
m_TagString: Untagged
|
||||
|
|
@ -663,18 +662,6 @@ CanvasGroup:
|
|||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!114 &8573803044562666523
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1090935460553673289}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3b2866720de64179bb03e3a3fc3a338a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &1133549829222054636
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -685,7 +672,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 2114107936807064161}
|
||||
- component: {fileID: 8663093466129629994}
|
||||
- component: {fileID: 7771149865091667873}
|
||||
m_Layer: 5
|
||||
m_Name: ImageVMoraleStatusCD
|
||||
m_TagString: Untagged
|
||||
|
|
@ -726,18 +712,6 @@ CanvasGroup:
|
|||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!114 &7771149865091667873
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1133549829222054636}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3b2866720de64179bb03e3a3fc3a338a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &1154057604348531999
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -787,7 +761,7 @@ GameObject:
|
|||
- component: {fileID: 2125981920785208919}
|
||||
- component: {fileID: 387931868888481672}
|
||||
m_Layer: 5
|
||||
m_Name: Text_Num
|
||||
m_Name: TextNum
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
|
@ -1314,7 +1288,7 @@ GameObject:
|
|||
- component: {fileID: 3146339773501587394}
|
||||
- component: {fileID: 8198224555751798791}
|
||||
m_Layer: 5
|
||||
m_Name: Text_Num
|
||||
m_Name: TextNum
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
|
@ -1521,7 +1495,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 1495491005338722581}
|
||||
- component: {fileID: 5140925621776867884}
|
||||
- component: {fileID: 7062313793423699110}
|
||||
- component: {fileID: 1809572293801692480}
|
||||
m_Layer: 5
|
||||
m_Name: UIHerosHeadItem0
|
||||
m_TagString: Untagged
|
||||
|
|
@ -1561,7 +1535,7 @@ CanvasGroup:
|
|||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!114 &7062313793423699110
|
||||
--- !u!114 &1809572293801692480
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -1570,7 +1544,7 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 1860130246038768075}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3b2866720de64179bb03e3a3fc3a338a, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: c08d3c3d52b644209ef849a67a185a9b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &1906298209479939313
|
||||
|
|
@ -1585,7 +1559,7 @@ GameObject:
|
|||
- component: {fileID: 5957624905142587057}
|
||||
- component: {fileID: 4345142370683351976}
|
||||
m_Layer: 5
|
||||
m_Name: Text_Num
|
||||
m_Name: TextNum
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
|
@ -1868,7 +1842,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 6618005121287804930}
|
||||
- component: {fileID: 6904952701147116467}
|
||||
- component: {fileID: 3028839920255440855}
|
||||
m_Layer: 5
|
||||
m_Name: UIHerosHeadIteamCD
|
||||
m_TagString: Untagged
|
||||
|
|
@ -1909,18 +1882,6 @@ CanvasGroup:
|
|||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!114 &3028839920255440855
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2444554545949185144}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3b2866720de64179bb03e3a3fc3a338a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &2498991690572404816
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2173,7 +2134,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 5099880457935515359}
|
||||
- component: {fileID: 1322804413685448450}
|
||||
- component: {fileID: 7236100431173485636}
|
||||
- component: {fileID: 1214435917764488}
|
||||
m_Layer: 5
|
||||
m_Name: UIHerosHeadItem0
|
||||
m_TagString: Untagged
|
||||
|
|
@ -2213,7 +2174,7 @@ CanvasGroup:
|
|||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!114 &7236100431173485636
|
||||
--- !u!114 &1214435917764488
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -2222,7 +2183,7 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 2658321541736125494}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3b2866720de64179bb03e3a3fc3a338a, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: c08d3c3d52b644209ef849a67a185a9b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &2674395828011275924
|
||||
|
|
@ -2237,7 +2198,7 @@ GameObject:
|
|||
- component: {fileID: 223712286739381602}
|
||||
- component: {fileID: 7257200069770668222}
|
||||
m_Layer: 5
|
||||
m_Name: Text_Num
|
||||
m_Name: TextNum
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
|
@ -2448,7 +2409,7 @@ GameObject:
|
|||
- component: {fileID: 5803968927345067760}
|
||||
- component: {fileID: 1804860228359693539}
|
||||
m_Layer: 5
|
||||
m_Name: Text_Num
|
||||
m_Name: TextNum
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
|
@ -2708,7 +2669,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 8306194047692603111}
|
||||
- component: {fileID: 4926334435933553287}
|
||||
- component: {fileID: 5564542557526142975}
|
||||
- component: {fileID: 6528377531958139869}
|
||||
m_Layer: 5
|
||||
m_Name: UI_LevelFightCarHD_1
|
||||
m_TagString: Untagged
|
||||
|
|
@ -2748,7 +2709,7 @@ CanvasGroup:
|
|||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!114 &5564542557526142975
|
||||
--- !u!114 &6528377531958139869
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -2757,7 +2718,7 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 2910333196438678095}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6f7634e064d24fa6a25af58cb14c64d6, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: c08d3c3d52b644209ef849a67a185a9b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &3003046248631765283
|
||||
|
|
@ -2770,7 +2731,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 5796195210346820739}
|
||||
- component: {fileID: 6871712182725094923}
|
||||
- component: {fileID: 6010783845379624973}
|
||||
m_Layer: 5
|
||||
m_Name: UIHerosHeadIteamCD
|
||||
m_TagString: Untagged
|
||||
|
|
@ -2811,18 +2771,6 @@ CanvasGroup:
|
|||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!114 &6010783845379624973
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3003046248631765283}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3b2866720de64179bb03e3a3fc3a338a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &3042755572722741709
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3266,7 +3214,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 863718667816533768}
|
||||
- component: {fileID: 6837628397680278551}
|
||||
- component: {fileID: 726315126000264759}
|
||||
m_Layer: 5
|
||||
m_Name: UIHerosHeadIteamCD
|
||||
m_TagString: Untagged
|
||||
|
|
@ -3307,18 +3254,6 @@ CanvasGroup:
|
|||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!114 &726315126000264759
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3739679035862032790}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3b2866720de64179bb03e3a3fc3a338a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &3821022035476846106
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3329,7 +3264,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 1963307705413708194}
|
||||
- component: {fileID: 4541570097979624781}
|
||||
- component: {fileID: 9173708861985688681}
|
||||
- component: {fileID: 4154248382368954530}
|
||||
m_Layer: 5
|
||||
m_Name: UIHerosHeadItem0
|
||||
m_TagString: Untagged
|
||||
|
|
@ -3369,7 +3304,7 @@ CanvasGroup:
|
|||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!114 &9173708861985688681
|
||||
--- !u!114 &4154248382368954530
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -3378,7 +3313,7 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 3821022035476846106}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3b2866720de64179bb03e3a3fc3a338a, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: c08d3c3d52b644209ef849a67a185a9b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &3858977872789687335
|
||||
|
|
@ -3468,7 +3403,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 7011916825590917671}
|
||||
- component: {fileID: 8764742869576481641}
|
||||
- component: {fileID: 6035748742390394509}
|
||||
m_Layer: 5
|
||||
m_Name: UIHerosHeadIteamCD
|
||||
m_TagString: Untagged
|
||||
|
|
@ -3509,18 +3443,6 @@ CanvasGroup:
|
|||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!114 &6035748742390394509
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3859128039239321128}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3b2866720de64179bb03e3a3fc3a338a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &3925845008222556554
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3800,7 +3722,7 @@ GameObject:
|
|||
- component: {fileID: 2177686117779631583}
|
||||
- component: {fileID: 2794101701795669584}
|
||||
m_Layer: 5
|
||||
m_Name: Text_Num
|
||||
m_Name: TextNum
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
|
@ -3932,7 +3854,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 8433184786396816891}
|
||||
- component: {fileID: 4582890874478469629}
|
||||
- component: {fileID: 2960014570804325301}
|
||||
- component: {fileID: 469336455906457142}
|
||||
m_Layer: 5
|
||||
m_Name: UIHerosHeadItem0
|
||||
m_TagString: Untagged
|
||||
|
|
@ -3972,7 +3894,7 @@ CanvasGroup:
|
|||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!114 &2960014570804325301
|
||||
--- !u!114 &469336455906457142
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -3981,7 +3903,7 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 4123895740505731190}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3b2866720de64179bb03e3a3fc3a338a, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: c08d3c3d52b644209ef849a67a185a9b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &4162574595817521940
|
||||
|
|
@ -3994,7 +3916,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 7295777690433176827}
|
||||
- component: {fileID: 315199752562241405}
|
||||
- component: {fileID: 6890180003778010017}
|
||||
- component: {fileID: 4577296265166486947}
|
||||
m_Layer: 5
|
||||
m_Name: UI_LevelFightCarHD_1
|
||||
m_TagString: Untagged
|
||||
|
|
@ -4034,7 +3956,7 @@ CanvasGroup:
|
|||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!114 &6890180003778010017
|
||||
--- !u!114 &4577296265166486947
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -4043,7 +3965,7 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 4162574595817521940}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6f7634e064d24fa6a25af58cb14c64d6, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: c08d3c3d52b644209ef849a67a185a9b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &4359722560758999098
|
||||
|
|
@ -4322,7 +4244,7 @@ GameObject:
|
|||
- component: {fileID: 4264952991137232066}
|
||||
- component: {fileID: 7240909222921045717}
|
||||
m_Layer: 5
|
||||
m_Name: Text_Num
|
||||
m_Name: TextNum
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
|
@ -4604,7 +4526,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 1998417692325941874}
|
||||
- component: {fileID: 3257473720197354246}
|
||||
- component: {fileID: 3460139301369386028}
|
||||
m_Layer: 5
|
||||
m_Name: UIHerosHeadIteamCD
|
||||
m_TagString: Untagged
|
||||
|
|
@ -4645,18 +4566,6 @@ CanvasGroup:
|
|||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!114 &3460139301369386028
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5295793607315088651}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3b2866720de64179bb03e3a3fc3a338a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &5341276239071690699
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4758,7 +4667,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 2369304576607143150}
|
||||
- component: {fileID: 4826558924360315650}
|
||||
- component: {fileID: 6240159037720696476}
|
||||
m_Layer: 5
|
||||
m_Name: ImageVMoraleStatusCD
|
||||
m_TagString: Untagged
|
||||
|
|
@ -4799,18 +4707,6 @@ CanvasGroup:
|
|||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!114 &6240159037720696476
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5463873491263421115}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3b2866720de64179bb03e3a3fc3a338a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &5492633319140861012
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4821,7 +4717,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 426857640084573128}
|
||||
- component: {fileID: 1466993751758284496}
|
||||
- component: {fileID: 1463206038447176233}
|
||||
m_Layer: 5
|
||||
m_Name: UIHerosHeadIteamCD
|
||||
m_TagString: Untagged
|
||||
|
|
@ -4862,18 +4757,6 @@ CanvasGroup:
|
|||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!114 &1463206038447176233
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5492633319140861012}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3b2866720de64179bb03e3a3fc3a338a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &5494136093177490600
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4884,7 +4767,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 5940946184620628357}
|
||||
- component: {fileID: 2319528530523126826}
|
||||
- component: {fileID: 9033546179105861180}
|
||||
- component: {fileID: 4359299983165015702}
|
||||
m_Layer: 5
|
||||
m_Name: UI_LevelFightCarHD_1
|
||||
m_TagString: Untagged
|
||||
|
|
@ -4924,7 +4807,7 @@ CanvasGroup:
|
|||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!114 &9033546179105861180
|
||||
--- !u!114 &4359299983165015702
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -4933,7 +4816,7 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 5494136093177490600}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6f7634e064d24fa6a25af58cb14c64d6, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: c08d3c3d52b644209ef849a67a185a9b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &5506750368238431207
|
||||
|
|
@ -5021,7 +4904,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 7491166540197609585}
|
||||
- component: {fileID: 4666489252859682358}
|
||||
- component: {fileID: 1197643785718722055}
|
||||
m_Layer: 5
|
||||
m_Name: ImageVMoraleStatusCD
|
||||
m_TagString: Untagged
|
||||
|
|
@ -5062,18 +4944,6 @@ CanvasGroup:
|
|||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!114 &1197643785718722055
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5677202329247162096}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3b2866720de64179bb03e3a3fc3a338a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &5745816240265946884
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -5159,7 +5029,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 1069259129087033026}
|
||||
- component: {fileID: 3760171552979254532}
|
||||
- component: {fileID: 6168040198713493246}
|
||||
- component: {fileID: 5943022365408656827}
|
||||
m_Layer: 5
|
||||
m_Name: UI_LevelFightCarHD_1
|
||||
m_TagString: Untagged
|
||||
|
|
@ -5199,7 +5069,7 @@ CanvasGroup:
|
|||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!114 &6168040198713493246
|
||||
--- !u!114 &5943022365408656827
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -5208,7 +5078,7 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 5792990281197451148}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6f7634e064d24fa6a25af58cb14c64d6, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: c08d3c3d52b644209ef849a67a185a9b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &5802984389681161258
|
||||
|
|
@ -5221,7 +5091,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 2402105358771890533}
|
||||
- component: {fileID: 6669588167290681558}
|
||||
- component: {fileID: 7721983688263336257}
|
||||
- component: {fileID: 7506445517853678360}
|
||||
m_Layer: 5
|
||||
m_Name: UIHerosHeadItem0
|
||||
m_TagString: Untagged
|
||||
|
|
@ -5261,7 +5131,7 @@ CanvasGroup:
|
|||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!114 &7721983688263336257
|
||||
--- !u!114 &7506445517853678360
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -5270,7 +5140,7 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 5802984389681161258}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3b2866720de64179bb03e3a3fc3a338a, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: c08d3c3d52b644209ef849a67a185a9b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &5877511486807881798
|
||||
|
|
@ -5283,7 +5153,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 2877932943156052623}
|
||||
- component: {fileID: 6129966350297834758}
|
||||
- component: {fileID: 5623851301945589698}
|
||||
m_Layer: 5
|
||||
m_Name: ImageVMoraleStatusCD
|
||||
m_TagString: Untagged
|
||||
|
|
@ -5324,18 +5193,6 @@ CanvasGroup:
|
|||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!114 &5623851301945589698
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5877511486807881798}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3b2866720de64179bb03e3a3fc3a338a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &6114455153789531782
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -5348,7 +5205,7 @@ GameObject:
|
|||
- component: {fileID: 845586102270655907}
|
||||
- component: {fileID: 5438283829106223629}
|
||||
m_Layer: 5
|
||||
m_Name: Text_Num
|
||||
m_Name: TextNum
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
|
@ -5482,7 +5339,7 @@ GameObject:
|
|||
- component: {fileID: 3356613526021368862}
|
||||
- component: {fileID: 3995334473354200655}
|
||||
m_Layer: 5
|
||||
m_Name: Text_Num
|
||||
m_Name: TextNum
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
|
@ -5802,7 +5659,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 7840185911124167250}
|
||||
- component: {fileID: 5627908773842347916}
|
||||
- component: {fileID: 4476400089437574433}
|
||||
- component: {fileID: 3738596570908054896}
|
||||
m_Layer: 5
|
||||
m_Name: UI_LevelFightCarHD_1
|
||||
m_TagString: Untagged
|
||||
|
|
@ -5842,7 +5699,7 @@ CanvasGroup:
|
|||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!114 &4476400089437574433
|
||||
--- !u!114 &3738596570908054896
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -5851,7 +5708,7 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 6481620810360959898}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6f7634e064d24fa6a25af58cb14c64d6, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: c08d3c3d52b644209ef849a67a185a9b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &6486154925146715112
|
||||
|
|
@ -6095,7 +5952,7 @@ GameObject:
|
|||
- component: {fileID: 4099492376553595653}
|
||||
- component: {fileID: 5491581472981698289}
|
||||
m_Layer: 5
|
||||
m_Name: Text_Num
|
||||
m_Name: TextNum
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
|
@ -6304,7 +6161,7 @@ GameObject:
|
|||
- component: {fileID: 2132387082435390850}
|
||||
- component: {fileID: 1094894726534027330}
|
||||
m_Layer: 5
|
||||
m_Name: Text_Num
|
||||
m_Name: TextNum
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
|
@ -6436,7 +6293,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 3666153915498305147}
|
||||
- component: {fileID: 7415103425312392108}
|
||||
- component: {fileID: 8254821316722051236}
|
||||
m_Layer: 5
|
||||
m_Name: ImageVMoraleStatusCD
|
||||
m_TagString: Untagged
|
||||
|
|
@ -6477,18 +6333,6 @@ CanvasGroup:
|
|||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!114 &8254821316722051236
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7227275064852531797}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3b2866720de64179bb03e3a3fc3a338a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &7283585141539629960
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -6501,7 +6345,7 @@ GameObject:
|
|||
- component: {fileID: 8068349374934231902}
|
||||
- component: {fileID: 1780577590212571845}
|
||||
m_Layer: 5
|
||||
m_Name: Text_Num
|
||||
m_Name: TextNum
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
|
@ -6670,7 +6514,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 8501828655102141444}
|
||||
- component: {fileID: 3939815385864332902}
|
||||
- component: {fileID: 4243234696098928037}
|
||||
- component: {fileID: 5541598213892411036}
|
||||
m_Layer: 5
|
||||
m_Name: UIHerosHeadItem0
|
||||
m_TagString: Untagged
|
||||
|
|
@ -6710,7 +6554,7 @@ CanvasGroup:
|
|||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!114 &4243234696098928037
|
||||
--- !u!114 &5541598213892411036
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -6719,7 +6563,7 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 7492352611162369613}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3b2866720de64179bb03e3a3fc3a338a, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: c08d3c3d52b644209ef849a67a185a9b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &7502604976779137010
|
||||
|
|
@ -6734,7 +6578,7 @@ GameObject:
|
|||
- component: {fileID: 5435609615368830117}
|
||||
- component: {fileID: 2854141677163514191}
|
||||
m_Layer: 5
|
||||
m_Name: Text_Num
|
||||
m_Name: TextNum
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
|
@ -7709,7 +7553,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 4801682784075720176}
|
||||
- component: {fileID: 8852638946572793502}
|
||||
- component: {fileID: 3257133952361092321}
|
||||
- component: {fileID: 1417601710416123796}
|
||||
m_Layer: 5
|
||||
m_Name: UIHerosHeadItem0
|
||||
m_TagString: Untagged
|
||||
|
|
@ -7749,7 +7593,7 @@ CanvasGroup:
|
|||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!114 &3257133952361092321
|
||||
--- !u!114 &1417601710416123796
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -7758,7 +7602,7 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 8302029064086112490}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3b2866720de64179bb03e3a3fc3a338a, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: c08d3c3d52b644209ef849a67a185a9b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &8319136230801594996
|
||||
|
|
@ -7999,7 +7843,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 7480114488167459769}
|
||||
- component: {fileID: 3798074579261230457}
|
||||
- component: {fileID: 9057224466835976454}
|
||||
- component: {fileID: 7061515406184197106}
|
||||
m_Layer: 5
|
||||
m_Name: UI_LevelFightCarHD_1
|
||||
m_TagString: Untagged
|
||||
|
|
@ -8039,7 +7883,7 @@ CanvasGroup:
|
|||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!114 &9057224466835976454
|
||||
--- !u!114 &7061515406184197106
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -8048,7 +7892,7 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 8643583988951712536}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6f7634e064d24fa6a25af58cb14c64d6, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: c08d3c3d52b644209ef849a67a185a9b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &8796510921623156584
|
||||
|
|
@ -8061,7 +7905,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 4326568761913991048}
|
||||
- component: {fileID: 5133361104289048898}
|
||||
- component: {fileID: 6944901808715132925}
|
||||
m_Layer: 5
|
||||
m_Name: ImageVMoraleStatusCD
|
||||
m_TagString: Untagged
|
||||
|
|
@ -8102,18 +7945,6 @@ CanvasGroup:
|
|||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!114 &6944901808715132925
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8796510921623156584}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3b2866720de64179bb03e3a3fc3a338a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &8912961014825248392
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -8201,7 +8032,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 7318712646562437152}
|
||||
- component: {fileID: 6475106924123926163}
|
||||
- component: {fileID: 3511045585699778868}
|
||||
m_Layer: 5
|
||||
m_Name: ImageVMoraleStatusCD
|
||||
m_TagString: Untagged
|
||||
|
|
@ -8242,18 +8072,6 @@ CanvasGroup:
|
|||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!114 &3511045585699778868
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9174461896136214544}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3b2866720de64179bb03e3a3fc3a338a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &9198228277108787006
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -8266,7 +8084,7 @@ GameObject:
|
|||
- component: {fileID: 4758894591470792226}
|
||||
- component: {fileID: 8690423646496743418}
|
||||
m_Layer: 5
|
||||
m_Name: Text_Num
|
||||
m_Name: TextNum
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
|
|
|||
|
|
@ -22970,7 +22970,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1751870265984415546
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -52975,7 +52975,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &4824299605121776632
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -159,14 +159,6 @@ MonoBehaviour:
|
|||
AssetTags:
|
||||
ActiveRuleName: EnableGroup
|
||||
Collectors:
|
||||
- CollectPath: Assets/Art/UI/Fonts
|
||||
CollectorGUID: f7c8f5f22ebbf834592253b33073ed9e
|
||||
CollectorType: 0
|
||||
AddressRuleName: AddressByFileName
|
||||
PackRuleName: PackDirectory
|
||||
FilterRuleName: CollectAll
|
||||
AssetTags:
|
||||
UserData:
|
||||
- CollectPath: Assets/Art/UI/Gfx
|
||||
CollectorGUID: aa20bdb46d74c0943b9f1af31262639f
|
||||
CollectorType: 0
|
||||
|
|
|
|||
|
|
@ -54,6 +54,7 @@ public partial class UIManager
|
|||
//战斗
|
||||
_WindowMeta(UINameConst.UITeamFight, UIWindowLayer.Normal, UIOpenType.Pop, true);
|
||||
_WindowMeta(UINameConst.UIFightTeam, UIWindowLayer.Normal, UIOpenType.Pop, true);
|
||||
_WindowMeta(UINameConst.UIFightTeamCD, UIWindowLayer.Normal, UIOpenType.Pop, true);
|
||||
_WindowMeta(UINameConst.UIFightInfoTip, UIWindowLayer.ForeGround, UIOpenType.Pop, true);
|
||||
_WindowMeta(UINameConst.UIFightClock, UIWindowLayer.Normal, UIOpenType.Pop, true);
|
||||
_WindowMeta(UINameConst.UIPause, UIWindowLayer.Normal, UIOpenType.FullScreen, false, true);
|
||||
|
|
@ -274,6 +275,7 @@ public static class UINameConst
|
|||
public static readonly string UISkillPut = "LevelSceneUI/UISkillPut";
|
||||
public static readonly string UIFightTeam = "LevelSceneUI/UIFightTeam";
|
||||
public static readonly string UIFightInfoTip = "LevelSceneUI/LevelFightInfo/UI_FightInfoTip";
|
||||
public static readonly string UIFightTeamCD = "LevelSceneUI/LevelDynamic/UIFightTeamCD";
|
||||
|
||||
#region 军团战
|
||||
/// <summary>
|
||||
|
|
|
|||
|
|
@ -106,7 +106,8 @@ public partial class UIManager : Singlenton<UIManager>, IInitable, IUpdatable
|
|||
//return null;
|
||||
}
|
||||
|
||||
var window = await _LoadWindow(path, true);
|
||||
var root = UIRoot.Instance.RootDic[eCanvasRoot];
|
||||
var window = await _LoadWindow(path, true, eCanvasRoot);
|
||||
if (window != null)
|
||||
{
|
||||
if (window.uiWindowLayer == UIWindowLayer.Normal)
|
||||
|
|
@ -127,7 +128,7 @@ public partial class UIManager : Singlenton<UIManager>, IInitable, IUpdatable
|
|||
|
||||
}
|
||||
|
||||
var root = UIRoot.Instance.RootDic[eCanvasRoot];
|
||||
|
||||
for (int i = root.transform.childCount - 1; i >=0; i--)
|
||||
{
|
||||
var winGo = root.transform.GetChild(i).gameObject;
|
||||
|
|
|
|||
|
|
@ -485,7 +485,7 @@ namespace Gameplay.Level
|
|||
{
|
||||
//_bgmID = await AudioManager.Instance.PlayAudio("NLD_BGM_01");
|
||||
AudioManager.Instance.StopAll();
|
||||
_bgmID = AudioManager.Instance.PlayAudio("bgm_1", AudioCriManager.EPlayType.Music, null, true);
|
||||
_bgmID = AudioManager.Instance.PlayAudio("bgm_ost2_01", AudioCriManager.EPlayType.Music, null, true);
|
||||
}
|
||||
|
||||
public void StopBGM()
|
||||
|
|
|
|||
|
|
@ -29,17 +29,32 @@ public class FightTeamManager
|
|||
public static UIWindow FightTeamWindow => _fightTeamWindow;
|
||||
private static UIWindow _fightTeamWindow;
|
||||
|
||||
public static List<UIWindow> FightTeamWindows = new();
|
||||
|
||||
public static void SetFightTeamWindow(UIWindow window)
|
||||
{
|
||||
_fightTeamWindow = window;
|
||||
_fightTeamWindow.IsUnEnabled = true;
|
||||
}
|
||||
|
||||
public static void AddFightTeamWindow( params UIWindow[] windows)
|
||||
{
|
||||
FightTeamWindows.Clear();
|
||||
foreach (var window in windows)
|
||||
{
|
||||
FightTeamWindows.Add(window);
|
||||
}
|
||||
}
|
||||
|
||||
public static void ActiveFightTeamWindow()
|
||||
{
|
||||
Instance.Init();
|
||||
_fightTeamWindow.IsUnEnabled = false;
|
||||
_fightTeamWindow?.ShowWindow();
|
||||
foreach (var window in FightTeamWindows)
|
||||
{
|
||||
window.ShowWindow();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
|||
|
|
@ -74,7 +74,10 @@ public partial class TeamManager
|
|||
|
||||
var battleTeamWindow = await UIFightTeamController.Open();
|
||||
battleTeamWindow.HideWindow();
|
||||
var battleTeamCdWindow = await UIFightTeamCDController.Open();
|
||||
battleTeamCdWindow.HideWindow();
|
||||
FightTeamManager.SetFightTeamWindow(battleTeamWindow);
|
||||
FightTeamManager.AddFightTeamWindow(battleTeamCdWindow);
|
||||
|
||||
FightInfoManager.CreateFightInfoWindow();
|
||||
|
||||
|
|
@ -174,7 +177,9 @@ public partial class TeamManager
|
|||
AssetManager.Instance.Unload(string.Format(UIManager.UI_PREFAB_PATH, UINameConst.UIVehicleStateBar), true);
|
||||
AssetManager.Instance.Unload(string.Format(UIManager.UI_PREFAB_PATH, UINameConst.UIEnemyStateBar), true);
|
||||
AssetManager.Instance.Unload(string.Format(UIManager.UI_PREFAB_PATH, UINameConst.UICharacterDamage), true);
|
||||
AssetManager.Instance.Unload(string.Format(UIManager.UI_PREFAB_PATH, UINameConst.UIFightTeamCD), true);
|
||||
|
||||
|
||||
AssetManager.Instance.Unload(LevelUIManager.GetMoralePic(true), true);
|
||||
AssetManager.Instance.Unload(LevelUIManager.GetMoralePic(false), true);
|
||||
|
||||
|
|
@ -252,6 +257,7 @@ public partial class TeamManager
|
|||
UIManager.Instance.CloseWindow(UINameConst.UIFightTarget);
|
||||
UIManager.Instance.CloseWindow(UINameConst.UIFightScene);
|
||||
UIManager.Instance.CloseWindow(UINameConst.UIFightTeam);
|
||||
UIManager.Instance.CloseWindow(UINameConst.UIFightTeamCD);
|
||||
FightInfoManager.RemoveFightInfoWindow();
|
||||
LevelManager.Instance.SkillInfoClose(true);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,8 +36,8 @@ public class UIFightCharacterHead: UIFightHeadBase
|
|||
private Image _imgJob;
|
||||
private Image _imgMaskEscape;
|
||||
private Image _imgMaskOnVehicle;
|
||||
private Image _imgSkillCd;
|
||||
private Image _imgSkillReady;
|
||||
// private Image _imgSkillCd;
|
||||
// private Image _imgSkillReady;
|
||||
private Button _btn;
|
||||
private Image _imgDead;
|
||||
private Image _imgSelect;
|
||||
|
|
@ -163,18 +163,18 @@ public class UIFightCharacterHead: UIFightHeadBase
|
|||
"ButtonCharacterPicRect/Content/ImageCharacterShadow/ImageSkillCDFull/ImageprofessionSapper/ImageJob");
|
||||
_imgMaskEscape = _GetComponent<Image>("ImageInEscape");
|
||||
_imgMaskOnVehicle = _GetComponent<Image>("ImageInVehicle");
|
||||
_imgSkillCd = _GetComponent<Image>(
|
||||
"ButtonCharacterPicRect/Content/ImageCharacterShadow/ImageSkillCDFull");
|
||||
_imgSkillReady = _GetComponent<Image>("ButtonCharacterPicRect/Content/ImageBattleReady/");
|
||||
_txtSkillCount = _GetComponent<TMP_Text>("ButtonCharacterPicRect/Content/ImageBattleReady/Text_Num");
|
||||
//_imgSkillCd = _GetComponent<Image>(
|
||||
//"ButtonCharacterPicRect/Content/ImageCharacterShadow/ImageSkillCDFull");
|
||||
//_imgSkillReady = _GetComponent<Image>("ButtonCharacterPicRect/Content/ImageBattleReady/");
|
||||
//_txtSkillCount = _GetComponent<TMP_Text>("ButtonCharacterPicRect/Content/ImageBattleReady/Text_Num");
|
||||
_btn = _GetComponent<Button>("ButtonCharacterPicRect");
|
||||
_imgDead = _GetComponent<Image>("ImageDead");
|
||||
_imgSelect = _GetComponent<Image>("ButtonCharacterPicRect/Content/ImageCharacterShadow/ImageSkillCDFull/ImageSelected");
|
||||
_imgEvacuate = _GetComponent<Image>("ImageRetreatBg");
|
||||
_imgEvacuate.gameObject.SetActiveEx(false);
|
||||
|
||||
_imgSkillCd.fillAmount = 0f;
|
||||
_imgSkillReady.gameObject.SetActiveEx(false);
|
||||
// _imgSkillCd.fillAmount = 0f;
|
||||
// _imgSkillReady.gameObject.SetActiveEx(false);
|
||||
_RegisterEvents();
|
||||
}
|
||||
|
||||
|
|
@ -373,36 +373,7 @@ public class UIFightCharacterHead: UIFightHeadBase
|
|||
/// </summary>
|
||||
private void _UpdateSkillCD()
|
||||
{
|
||||
if (unit == null)
|
||||
{
|
||||
_imgSkillCd.fillAmount = 0f;
|
||||
_imgSkillReady.gameObject.SetActiveEx(false);
|
||||
_leftCdTime = 1f;
|
||||
return;
|
||||
}
|
||||
|
||||
if (_character.statusData.isDead)
|
||||
{
|
||||
_imgSkillCd.fillAmount = 0f;
|
||||
_imgSkillReady.gameObject.SetActiveEx(false);
|
||||
_leftCdTime = 1f;
|
||||
return;
|
||||
}
|
||||
|
||||
var skillMgr = SkillManager.instance.GetUnitSkillManager(unit);
|
||||
if (skillMgr == null)
|
||||
{
|
||||
_imgSkillCd.fillAmount = 0f;
|
||||
_imgSkillReady.gameObject.SetActiveEx(false);
|
||||
_leftCdTime = 1f;
|
||||
return;
|
||||
}
|
||||
|
||||
//var totalCdTime = skillMgr.positiveSkill.runtimeData.configData.ChargeParam;
|
||||
var curCdTime = skillMgr.positiveSkill.chargeLogic.chargeProgress;
|
||||
var totalCount = skillMgr.positiveSkill.chargeLogic.nowStoreCount;
|
||||
|
||||
// if (totalCdTime <= 0)
|
||||
// if (unit == null)
|
||||
// {
|
||||
// _imgSkillCd.fillAmount = 0f;
|
||||
// _imgSkillReady.gameObject.SetActiveEx(false);
|
||||
|
|
@ -410,22 +381,51 @@ public class UIFightCharacterHead: UIFightHeadBase
|
|||
// return;
|
||||
// }
|
||||
//
|
||||
// if (totalCdTime > 0 && _leftCdTime <= 0)
|
||||
// if (_character.statusData.isDead)
|
||||
// {
|
||||
// _imgSkillCd.fillAmount = 1f;
|
||||
// _imgSkillReady.gameObject.SetActiveEx(true);
|
||||
// _leftCdTime = curCdTime;
|
||||
// _imgSkillCd.fillAmount = 0f;
|
||||
// _imgSkillReady.gameObject.SetActiveEx(false);
|
||||
// _leftCdTime = 1f;
|
||||
// return;
|
||||
// }
|
||||
|
||||
// if (Mathf.Abs(_leftCdTime - curCdTime) > 0.01f)
|
||||
//
|
||||
// var skillMgr = SkillManager.instance.GetUnitSkillManager(unit);
|
||||
// if (skillMgr == null)
|
||||
// {
|
||||
//float fill = (totalCdTime - math.max(_leftCdTime, 0)) / totalCdTime;
|
||||
float fill = curCdTime;
|
||||
_imgSkillCd.fillAmount = fill;
|
||||
_imgSkillReady.gameObject.SetActiveEx(totalCount > 0);
|
||||
_txtSkillCount.text = totalCount.ToString();
|
||||
_leftCdTime = curCdTime;
|
||||
// _imgSkillCd.fillAmount = 0f;
|
||||
// _imgSkillReady.gameObject.SetActiveEx(false);
|
||||
// _leftCdTime = 1f;
|
||||
// return;
|
||||
// }
|
||||
//
|
||||
// //var totalCdTime = skillMgr.positiveSkill.runtimeData.configData.ChargeParam;
|
||||
// var curCdTime = skillMgr.positiveSkill.chargeLogic.chargeProgress;
|
||||
// var totalCount = skillMgr.positiveSkill.chargeLogic.nowStoreCount;
|
||||
//
|
||||
// // if (totalCdTime <= 0)
|
||||
// // {
|
||||
// // _imgSkillCd.fillAmount = 0f;
|
||||
// // _imgSkillReady.gameObject.SetActiveEx(false);
|
||||
// // _leftCdTime = 1f;
|
||||
// // return;
|
||||
// // }
|
||||
// //
|
||||
// // if (totalCdTime > 0 && _leftCdTime <= 0)
|
||||
// // {
|
||||
// // _imgSkillCd.fillAmount = 1f;
|
||||
// // _imgSkillReady.gameObject.SetActiveEx(true);
|
||||
// // _leftCdTime = curCdTime;
|
||||
// // return;
|
||||
// // }
|
||||
//
|
||||
// // if (Mathf.Abs(_leftCdTime - curCdTime) > 0.01f)
|
||||
// // {
|
||||
// //float fill = (totalCdTime - math.max(_leftCdTime, 0)) / totalCdTime;
|
||||
// float fill = curCdTime;
|
||||
// _imgSkillCd.fillAmount = fill;
|
||||
// _imgSkillReady.gameObject.SetActiveEx(totalCount > 0);
|
||||
// _txtSkillCount.text = totalCount.ToString();
|
||||
// _leftCdTime = curCdTime;
|
||||
//}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,92 @@
|
|||
using System;
|
||||
using Framework;
|
||||
using Gameplay.Character;
|
||||
using Gameplay.Level;
|
||||
using Gameplay.Skill;
|
||||
using Gameplay.Unit;
|
||||
using Gameplay.Unit.Data;
|
||||
using TMPro;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class UIFightSkillCD: UIFightHeadBase
|
||||
{
|
||||
private Image _imgSkillCd;
|
||||
private Image _imgSkillReady;
|
||||
private float _leftCdTime = 999; //剩余技能CD时间
|
||||
private Character _character; //角色对象，unit转类型得到
|
||||
private Level _curLevel; //当前关卡
|
||||
private TMP_Text _txtSkillCount;
|
||||
|
||||
private void Update()
|
||||
{
|
||||
_UpdateSkillCD();
|
||||
}
|
||||
|
||||
public override void SetData(GameUnit unit)
|
||||
{
|
||||
base.SetData(unit);
|
||||
_Init(unit);
|
||||
|
||||
//_character = unit as Character;
|
||||
//var teamUnitInfo = TeamManager.Instance.GetTeamUnitInfoByUid(uid);
|
||||
}
|
||||
|
||||
private void _Init(GameUnit gameUnit)
|
||||
{
|
||||
if (gameUnit.gameunitType == EGameUnitType.Character)
|
||||
{
|
||||
_imgSkillCd = _GetComponent<Image>("UIHerosHeadIteamCD/ImageCharacterShadow/ImageSkillCDFull");
|
||||
_imgSkillReady = _GetComponent<Image>("UIHerosHeadIteamCD/ImageBattleReady/");
|
||||
_txtSkillCount = _GetComponent<TMP_Text>("UIHerosHeadIteamCD/ImageBattleReady/TextNum");
|
||||
}
|
||||
else
|
||||
{
|
||||
_imgSkillCd = _GetComponent<Image>("ImageVMoraleStatusCD/ImageVehicleShadow/ImageVSkillCDFull");
|
||||
_imgSkillReady = _GetComponent<Image>("ImageVMoraleStatusCD/ImageBattleReady");
|
||||
_txtSkillCount = _GetComponent<TMP_Text>("ImageVMoraleStatusCD/ImageBattleReady/TextNum");
|
||||
}
|
||||
|
||||
_imgSkillCd.fillAmount = 0f;
|
||||
_imgSkillReady.gameObject.SetActiveEx(false);
|
||||
}
|
||||
|
||||
private void _UpdateSkillCD()
|
||||
{
|
||||
if (!_imgSkillCd)
|
||||
return;
|
||||
if (unit == null)
|
||||
{
|
||||
_imgSkillCd.fillAmount = 0f;
|
||||
_imgSkillReady.gameObject.SetActiveEx(false);
|
||||
_leftCdTime = 1f;
|
||||
return;
|
||||
}
|
||||
|
||||
if (unit.statusData.isDead)
|
||||
{
|
||||
_imgSkillCd.fillAmount = 0f;
|
||||
_imgSkillReady.gameObject.SetActiveEx(false);
|
||||
_leftCdTime = 1f;
|
||||
return;
|
||||
}
|
||||
|
||||
var skillMgr = SkillManager.instance.GetUnitSkillManager(unit);
|
||||
if (skillMgr == null)
|
||||
{
|
||||
_imgSkillCd.fillAmount = 0f;
|
||||
_imgSkillReady.gameObject.SetActiveEx(false);
|
||||
_leftCdTime = 1f;
|
||||
return;
|
||||
}
|
||||
|
||||
//var totalCdTime = skillMgr.positiveSkill.runtimeData.configData.ChargeParam;
|
||||
var curCdTime = skillMgr.positiveSkill.chargeLogic.chargeProgress;
|
||||
var totalCount = skillMgr.positiveSkill.chargeLogic.nowStoreCount;
|
||||
|
||||
float fill = curCdTime;
|
||||
_imgSkillCd.fillAmount = fill;
|
||||
_imgSkillReady.gameObject.SetActiveEx(totalCount > 0);
|
||||
_txtSkillCount.text = totalCount.ToString();
|
||||
_leftCdTime = curCdTime;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
fileFormatVersion: 2
|
||||
guid: c08d3c3d52b644209ef849a67a185a9b
|
||||
timeCreated: 1744093241
|
||||
|
|
@ -28,13 +28,13 @@ public class UIFightVehicleHead: UIFightHeadBase
|
|||
private Image _imgShieldBar;
|
||||
private Image _imgState;
|
||||
private Image _imgJob;
|
||||
private Image _imgSkillCd;
|
||||
private Image _imgSkillReady;
|
||||
// private Image _imgSkillCd;
|
||||
// private Image _imgSkillReady;
|
||||
private Image _imgDead;
|
||||
private Button _btn;
|
||||
private Image _imgSelect;
|
||||
private Image _imgEvacuate;
|
||||
private TMP_Text _txtSkillCount;
|
||||
//private TMP_Text _txtSkillCount;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
|
|
@ -53,7 +53,7 @@ public class UIFightVehicleHead: UIFightHeadBase
|
|||
return;
|
||||
}
|
||||
_UpdateBar();
|
||||
_UpdateSkillCD();
|
||||
//_UpdateSkillCD();
|
||||
}
|
||||
|
||||
private void OnDestroy()
|
||||
|
|
@ -95,17 +95,17 @@ public class UIFightVehicleHead: UIFightHeadBase
|
|||
_imgShieldBar = _GetComponent<Image>("Content/ImageVehicleStatusBar/ImageVBattleHp");
|
||||
_imgJob = _GetComponent<Image>("Content/ImageVehicleShadow/ImageVprofession/ImageVehicle");
|
||||
_imgState = _GetComponent<Image>("Content/ImageVehicleShadow/ImageVStateParalysis");
|
||||
_imgSkillCd = _GetComponent<Image>("Content/ImageVehicleShadow/ImageVSkillCDFull");
|
||||
_imgSkillReady = _GetComponent<Image>("Content/ImageBattleReady");
|
||||
_txtSkillCount = _GetComponent<TMP_Text>("Content/ImageBattleReady/Text_Num");
|
||||
// _imgSkillCd = _GetComponent<Image>("Content/ImageVehicleShadow/ImageVSkillCDFull");
|
||||
// _imgSkillReady = _GetComponent<Image>("Content/ImageBattleReady");
|
||||
// _txtSkillCount = _GetComponent<TMP_Text>("Content/ImageBattleReady/Text_Num");
|
||||
_imgDead = _GetComponent<Image>("Content/ImageDead");
|
||||
_btn = _GetComponent<Button>("Content/ButtonVehiclePicRect");
|
||||
_imgSelect = _GetComponent<Image>("Content/ImageVehicleShadow/ImageSelected");
|
||||
_imgEvacuate = _GetComponent<Image>("Content/ImageRetreatBg");
|
||||
_imgEvacuate.gameObject.SetActiveEx(false);
|
||||
|
||||
_imgSkillCd.fillAmount = 0f;
|
||||
_imgSkillReady.gameObject.SetActiveEx(false);
|
||||
// _imgSkillCd.fillAmount = 0f;
|
||||
// _imgSkillReady.gameObject.SetActiveEx(false);
|
||||
_RegisterEvents();
|
||||
}
|
||||
|
||||
|
|
@ -218,36 +218,7 @@ public class UIFightVehicleHead: UIFightHeadBase
|
|||
/// </summary>
|
||||
private void _UpdateSkillCD()
|
||||
{
|
||||
if (unit == null)
|
||||
{
|
||||
_imgSkillCd.fillAmount = 0f;
|
||||
_imgSkillReady.gameObject.SetActiveEx(false);
|
||||
_leftCdTime = 1f;
|
||||
return;
|
||||
}
|
||||
|
||||
if (unit.statusData.isDead)
|
||||
{
|
||||
_imgSkillCd.fillAmount = 0f;
|
||||
_imgSkillReady.gameObject.SetActiveEx(false);
|
||||
_leftCdTime = 1f;
|
||||
return;
|
||||
}
|
||||
|
||||
var skillMgr = SkillManager.instance.GetUnitSkillManager(unit);
|
||||
if (skillMgr == null)
|
||||
{
|
||||
_imgSkillCd.fillAmount = 0f;
|
||||
_imgSkillReady.gameObject.SetActiveEx(false);
|
||||
_leftCdTime = 1f;
|
||||
return;
|
||||
}
|
||||
|
||||
//var totalCdTime = skillMgr.positiveSkill.runtimeData.configData.ChargeParam;
|
||||
var curCdTime = skillMgr.positiveSkill.chargeLogic.chargeProgress;
|
||||
var totalCount = skillMgr.positiveSkill.chargeLogic.nowStoreCount;
|
||||
|
||||
// if (totalCdTime <= 0)
|
||||
// if (unit == null)
|
||||
// {
|
||||
// _imgSkillCd.fillAmount = 0f;
|
||||
// _imgSkillReady.gameObject.SetActiveEx(false);
|
||||
|
|
@ -255,27 +226,56 @@ public class UIFightVehicleHead: UIFightHeadBase
|
|||
// return;
|
||||
// }
|
||||
//
|
||||
// if (totalCdTime > 0 && _leftCdTime <= 0)
|
||||
// if (unit.statusData.isDead)
|
||||
// {
|
||||
// _imgSkillCd.fillAmount = 1f;
|
||||
// _imgSkillReady.gameObject.SetActiveEx(true);
|
||||
// _leftCdTime = curCdTime;
|
||||
// _imgSkillCd.fillAmount = 0f;
|
||||
// _imgSkillReady.gameObject.SetActiveEx(false);
|
||||
// _leftCdTime = 1f;
|
||||
// return;
|
||||
// }
|
||||
|
||||
// if (Mathf.Abs(_leftCdTime - curCdTime) > 0.01f)
|
||||
//
|
||||
// var skillMgr = SkillManager.instance.GetUnitSkillManager(unit);
|
||||
// if (skillMgr == null)
|
||||
// {
|
||||
// float fill = (totalCdTime - math.max(_leftCdTime, 0)) / totalCdTime;
|
||||
// _imgSkillCd.fillAmount = fill;
|
||||
// _imgSkillCd.fillAmount = 0f;
|
||||
// _imgSkillReady.gameObject.SetActiveEx(false);
|
||||
// _leftCdTime = curCdTime;
|
||||
// _leftCdTime = 1f;
|
||||
// return;
|
||||
// }
|
||||
|
||||
float fill = curCdTime;
|
||||
_imgSkillCd.fillAmount = fill;
|
||||
_imgSkillReady.gameObject.SetActiveEx(totalCount > 0);
|
||||
_txtSkillCount.text = totalCount.ToString();
|
||||
_leftCdTime = curCdTime;
|
||||
//
|
||||
// //var totalCdTime = skillMgr.positiveSkill.runtimeData.configData.ChargeParam;
|
||||
// var curCdTime = skillMgr.positiveSkill.chargeLogic.chargeProgress;
|
||||
// var totalCount = skillMgr.positiveSkill.chargeLogic.nowStoreCount;
|
||||
//
|
||||
// // if (totalCdTime <= 0)
|
||||
// // {
|
||||
// // _imgSkillCd.fillAmount = 0f;
|
||||
// // _imgSkillReady.gameObject.SetActiveEx(false);
|
||||
// // _leftCdTime = 1f;
|
||||
// // return;
|
||||
// // }
|
||||
// //
|
||||
// // if (totalCdTime > 0 && _leftCdTime <= 0)
|
||||
// // {
|
||||
// // _imgSkillCd.fillAmount = 1f;
|
||||
// // _imgSkillReady.gameObject.SetActiveEx(true);
|
||||
// // _leftCdTime = curCdTime;
|
||||
// // return;
|
||||
// // }
|
||||
//
|
||||
// // if (Mathf.Abs(_leftCdTime - curCdTime) > 0.01f)
|
||||
// // {
|
||||
// // float fill = (totalCdTime - math.max(_leftCdTime, 0)) / totalCdTime;
|
||||
// // _imgSkillCd.fillAmount = fill;
|
||||
// // _imgSkillReady.gameObject.SetActiveEx(false);
|
||||
// // _leftCdTime = curCdTime;
|
||||
// // }
|
||||
//
|
||||
// float fill = curCdTime;
|
||||
// _imgSkillCd.fillAmount = fill;
|
||||
// _imgSkillReady.gameObject.SetActiveEx(totalCount > 0);
|
||||
// _txtSkillCount.text = totalCount.ToString();
|
||||
// _leftCdTime = curCdTime;
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using TMPro;
|
||||
using Framework;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
using UnityEngine.UIElements;
|
||||
using Button = UnityEngine.UI.Button;
|
||||
using Image = UnityEngine.UI.Image;
|
||||
using Toggle = UnityEngine.UI.Toggle;
|
||||
using ScrollView = PhxhSDK.PhxhScrollView;
|
||||
|
||||
public class UIFightTeamCDBinder
|
||||
{
|
||||
|
||||
public static void GetComponents(UIFightTeamCDController window)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
/****** 定义变量语句 ******
|
||||
|
||||
****** End ******/
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: aafdd7bce89256340b11496a7d8bc0ad
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,142 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using Cysharp.Threading.Tasks;
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
using UnityEngine.UIElements;
|
||||
using Button = UnityEngine.UI.Button;
|
||||
using Image = UnityEngine.UI.Image;
|
||||
using Toggle = UnityEngine.UI.Toggle;
|
||||
using ScrollView = PhxhSDK.PhxhScrollView;
|
||||
using Framework;
|
||||
using Gameplay.Unit;
|
||||
|
||||
public class UIFightTeamCDController : UIWindow
|
||||
{
|
||||
//UI GameObj
|
||||
///Auto Gen Start///
|
||||
|
||||
///Auto Gen End///
|
||||
|
||||
// deal with input data
|
||||
|
||||
private List<GameObject> _headList = new();
|
||||
|
||||
private List<uint> _displayList = new();
|
||||
|
||||
public static async UniTask<UIWindow> Open()
|
||||
{
|
||||
return await UIManager.Instance.CreateAndOpenWindow(UINameConst.UIFightTeamCD, null, UIManager.ECanvasRoot.Dynamic0);
|
||||
}
|
||||
public override void PreLoad(object data = null)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
// Use this for initialization
|
||||
public override void OnInit()
|
||||
{
|
||||
//bind UI GameObj
|
||||
UIFightTeamCDBinder.GetComponents(this);
|
||||
|
||||
var goFight = FindObj("UI_LiuHaiRight/UI_OnFight");
|
||||
for (int i = 0; i < goFight.transform.childCount; i++)
|
||||
{
|
||||
var go = FindObj("UI_LiuHaiRight/UI_OnFight/Item" + i);
|
||||
_headList.Add(go);
|
||||
}
|
||||
}
|
||||
|
||||
//invoke when open window
|
||||
protected override void OnShowWindow(object data = null)
|
||||
{
|
||||
_SetData();
|
||||
_Refresh();
|
||||
}
|
||||
|
||||
//invoke when reload window
|
||||
protected override void OnReloadWindow(object data = null)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
//invoke when close window
|
||||
protected override void OnHideWindow()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
//invoke when destroy
|
||||
public override void OnRelease()
|
||||
{
|
||||
base.OnRelease();
|
||||
}
|
||||
|
||||
private void _SetData()
|
||||
{
|
||||
var fightList = FightTeamManager.Instance.GetFightIDList();
|
||||
_displayList.Clear();
|
||||
if (fightList != null)
|
||||
{
|
||||
foreach (var uid in fightList)
|
||||
{
|
||||
_displayList.Add(uid);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void _Refresh()
|
||||
{
|
||||
_RefreshItems();
|
||||
}
|
||||
|
||||
private void _RefreshItems()
|
||||
{
|
||||
for (int i = 0; i < _headList.Count; i++)
|
||||
{
|
||||
_RefreshItem(i);
|
||||
}
|
||||
}
|
||||
|
||||
private void _RefreshItem(int index)
|
||||
{
|
||||
var headObj = _headList[index];
|
||||
if (index >= _displayList.Count)
|
||||
{
|
||||
headObj.gameObject.SetActiveEx(false);
|
||||
return;
|
||||
}
|
||||
var uid = _displayList[index];
|
||||
|
||||
headObj.gameObject.SetActiveEx(true);
|
||||
var teamUnitInfo = FightTeamManager.Instance.GetFightTeamUnitInfo(uid);
|
||||
var isInFightPool = GameUnitManager.instance.infightUnits.Contains(uid);
|
||||
if (!isInFightPool)
|
||||
{
|
||||
return;
|
||||
}
|
||||
var unit = GameUnitManager.instance.infightUnits.Search(uid);
|
||||
var itemCObj = headObj.transform.GetChild(0).gameObject;
|
||||
var itemVObj = headObj.transform.GetChild(1).gameObject;
|
||||
if (unit != null && teamUnitInfo != null)
|
||||
{
|
||||
if (teamUnitInfo.Type == TeamUnitInfo.CharacType.Hero)
|
||||
{
|
||||
itemCObj.SetActiveEx(true);
|
||||
itemVObj.SetActiveEx(false);
|
||||
var cmp = itemCObj.GetComponent<UIFightSkillCD>();
|
||||
cmp.SetData(unit);
|
||||
cmp.Refresh();
|
||||
}
|
||||
else
|
||||
{
|
||||
itemCObj.SetActiveEx(false);
|
||||
itemVObj.SetActiveEx(true);
|
||||
var cmp = itemVObj.GetComponent<UIFightSkillCD>();
|
||||
cmp.SetData(unit);
|
||||
cmp.Refresh();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 443f19f38503a0a4d906376a5425905a
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Loading…
Reference in New Issue