diff --git a/Assets/arts/sounds/sfx/battle/1000003.wav b/Assets/arts/sounds/sfx/battle/1000003.wav index 53d7e7941..53c8f461f 100644 Binary files a/Assets/arts/sounds/sfx/battle/1000003.wav and b/Assets/arts/sounds/sfx/battle/1000003.wav differ diff --git a/Assets/arts/sounds/sfx/battle/1000011.wav b/Assets/arts/sounds/sfx/battle/1000011.wav index c6e954281..1c9b828e3 100644 Binary files a/Assets/arts/sounds/sfx/battle/1000011.wav and b/Assets/arts/sounds/sfx/battle/1000011.wav differ diff --git a/Assets/arts/sounds/sfx/battle/1000013.wav b/Assets/arts/sounds/sfx/battle/1000013.wav index ee94b097c..9fa3f6ce3 100644 Binary files a/Assets/arts/sounds/sfx/battle/1000013.wav and b/Assets/arts/sounds/sfx/battle/1000013.wav differ diff --git a/Assets/arts/sounds/sfx/battle/1000014.wav b/Assets/arts/sounds/sfx/battle/1000014.wav index 457ec8c3a..464708310 100644 Binary files a/Assets/arts/sounds/sfx/battle/1000014.wav and b/Assets/arts/sounds/sfx/battle/1000014.wav differ diff --git a/Assets/arts/spines/characters/p0019/p0019_material.mat b/Assets/arts/spines/characters/p0019/p0019_material.mat index d296c15a0..ac92a2fb8 100644 --- a/Assets/arts/spines/characters/p0019/p0019_material.mat +++ b/Assets/arts/spines/characters/p0019/p0019_material.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: p0019_material m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} - m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -32,7 +32,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 m_Colors: diff --git a/Assets/arts/spines/ui/main_btn_gift_new/main_btn_gift_new_material.mat b/Assets/arts/spines/ui/main_btn_gift_new/main_btn_gift_new_material.mat index 5939fb356..09fc0efce 100644 --- a/Assets/arts/spines/ui/main_btn_gift_new/main_btn_gift_new_material.mat +++ b/Assets/arts/spines/ui/main_btn_gift_new/main_btn_gift_new_material.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: main_btn_gift_new_material m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} - m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -32,7 +32,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 m_Colors: diff --git a/Assets/arts/spines/ui/ui_battle_chest_open/ui_battle_chest_open_material.mat b/Assets/arts/spines/ui/ui_battle_chest_open/ui_battle_chest_open_material.mat index 942c6d26f..035646ffc 100644 --- a/Assets/arts/spines/ui/ui_battle_chest_open/ui_battle_chest_open_material.mat +++ b/Assets/arts/spines/ui/ui_battle_chest_open/ui_battle_chest_open_material.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ui_battle_chest_open_material m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} - m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -32,7 +32,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 m_Colors: diff --git a/Assets/arts/spines/ui/ui_battle_warning/ui_battle_warning_material.mat b/Assets/arts/spines/ui/ui_battle_warning/ui_battle_warning_material.mat index b06eb68c7..73403d1e7 100644 --- a/Assets/arts/spines/ui/ui_battle_warning/ui_battle_warning_material.mat +++ b/Assets/arts/spines/ui/ui_battle_warning/ui_battle_warning_material.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ui_battle_warning_material m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} - m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -32,7 +32,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 m_Colors: diff --git a/Assets/arts/spines/ui/ui_bounty_chestopen_1/ui_bounty_chestopen_1_material.mat b/Assets/arts/spines/ui/ui_bounty_chestopen_1/ui_bounty_chestopen_1_material.mat index 246881266..a7a73a9fd 100644 --- a/Assets/arts/spines/ui/ui_bounty_chestopen_1/ui_bounty_chestopen_1_material.mat +++ b/Assets/arts/spines/ui/ui_bounty_chestopen_1/ui_bounty_chestopen_1_material.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ui_bounty_chestopen_1_material m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} - m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -32,7 +32,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 m_Colors: diff --git a/Assets/arts/spines/ui/ui_bounty_chestopen_2/ui_bounty_chestopen_2_material.mat b/Assets/arts/spines/ui/ui_bounty_chestopen_2/ui_bounty_chestopen_2_material.mat index bb63ae32b..f2a68ca57 100644 --- a/Assets/arts/spines/ui/ui_bounty_chestopen_2/ui_bounty_chestopen_2_material.mat +++ b/Assets/arts/spines/ui/ui_bounty_chestopen_2/ui_bounty_chestopen_2_material.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ui_bounty_chestopen_2_material m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} - m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -32,7 +32,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 m_Colors: diff --git a/Assets/arts/spines/ui/ui_bounty_chestopen_3/ui_bounty_chestopen_3_material.mat b/Assets/arts/spines/ui/ui_bounty_chestopen_3/ui_bounty_chestopen_3_material.mat index 3cbf7665e..c3f339996 100644 --- a/Assets/arts/spines/ui/ui_bounty_chestopen_3/ui_bounty_chestopen_3_material.mat +++ b/Assets/arts/spines/ui/ui_bounty_chestopen_3/ui_bounty_chestopen_3_material.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ui_bounty_chestopen_3_material m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} - m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -32,7 +32,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 m_Colors: diff --git a/Assets/arts/spines/ui/ui_bounty_chestopen_4/ui_bounty_chestopen_4_material.mat b/Assets/arts/spines/ui/ui_bounty_chestopen_4/ui_bounty_chestopen_4_material.mat index 0fd52fee4..49a414e03 100644 --- a/Assets/arts/spines/ui/ui_bounty_chestopen_4/ui_bounty_chestopen_4_material.mat +++ b/Assets/arts/spines/ui/ui_bounty_chestopen_4/ui_bounty_chestopen_4_material.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ui_bounty_chestopen_4_material m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} - m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -32,7 +32,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 m_Colors: diff --git a/Assets/arts/spines/ui/ui_bounty_chestopen_5/ui_bounty_chestopen_5_material.mat b/Assets/arts/spines/ui/ui_bounty_chestopen_5/ui_bounty_chestopen_5_material.mat index f429cc407..accf0b7ba 100644 --- a/Assets/arts/spines/ui/ui_bounty_chestopen_5/ui_bounty_chestopen_5_material.mat +++ b/Assets/arts/spines/ui/ui_bounty_chestopen_5/ui_bounty_chestopen_5_material.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ui_bounty_chestopen_5_material m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} - m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -32,7 +32,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 m_Colors: diff --git a/Assets/arts/spines/ui/ui_daily_challenge_buff/ui_daily_challenge_buff_material.mat b/Assets/arts/spines/ui/ui_daily_challenge_buff/ui_daily_challenge_buff_material.mat index 5e3bb4e23..d3990a2ba 100644 --- a/Assets/arts/spines/ui/ui_daily_challenge_buff/ui_daily_challenge_buff_material.mat +++ b/Assets/arts/spines/ui/ui_daily_challenge_buff/ui_daily_challenge_buff_material.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ui_daily_challenge_buff_material m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} - m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -32,7 +32,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 m_Colors: diff --git a/Assets/arts/spines/ui/ui_first_dec/ui_first_dec_material.mat b/Assets/arts/spines/ui/ui_first_dec/ui_first_dec_material.mat index 070ae57d4..e300e4851 100644 --- a/Assets/arts/spines/ui/ui_first_dec/ui_first_dec_material.mat +++ b/Assets/arts/spines/ui/ui_first_dec/ui_first_dec_material.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ui_first_dec_material m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} - m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -32,7 +32,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 m_Colors: diff --git a/Assets/arts/spines/ui/ui_main_btn_fund/ui_main_btn_fund_material.mat b/Assets/arts/spines/ui/ui_main_btn_fund/ui_main_btn_fund_material.mat index 66e63174c..99a9b3fa7 100644 --- a/Assets/arts/spines/ui/ui_main_btn_fund/ui_main_btn_fund_material.mat +++ b/Assets/arts/spines/ui/ui_main_btn_fund/ui_main_btn_fund_material.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ui_main_btn_fund_material m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} - m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -32,7 +32,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 m_Colors: diff --git a/Assets/arts/spines/ui/ui_main_btn_gift_first/ui_main_btn_gift_first_material.mat b/Assets/arts/spines/ui/ui_main_btn_gift_first/ui_main_btn_gift_first_material.mat index e4d848b86..f24f63107 100644 --- a/Assets/arts/spines/ui/ui_main_btn_gift_first/ui_main_btn_gift_first_material.mat +++ b/Assets/arts/spines/ui/ui_main_btn_gift_first/ui_main_btn_gift_first_material.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ui_main_btn_gift_first_material m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} - m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -32,7 +32,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 m_Colors: diff --git a/Assets/arts/spines/ui/ui_main_btn_gift_grow/ui_main_btn_gift_grow_material.mat b/Assets/arts/spines/ui/ui_main_btn_gift_grow/ui_main_btn_gift_grow_material.mat index 9b3a37508..941099ccb 100644 --- a/Assets/arts/spines/ui/ui_main_btn_gift_grow/ui_main_btn_gift_grow_material.mat +++ b/Assets/arts/spines/ui/ui_main_btn_gift_grow/ui_main_btn_gift_grow_material.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ui_main_btn_gift_grow_material m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} - m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -32,7 +32,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 m_Colors: diff --git a/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_material.mat b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_material.mat index b47e1abad..8bb476943 100644 --- a/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_material.mat +++ b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_material.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ui_main_btn_growup_material m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} - m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -32,7 +32,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 m_Colors: diff --git a/Assets/arts/spines/ui/ui_main_btn_hang/ui_main_btn_hang_material.mat b/Assets/arts/spines/ui/ui_main_btn_hang/ui_main_btn_hang_material.mat index 37f69ec08..2679f70a7 100644 --- a/Assets/arts/spines/ui/ui_main_btn_hang/ui_main_btn_hang_material.mat +++ b/Assets/arts/spines/ui/ui_main_btn_hang/ui_main_btn_hang_material.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ui_main_btn_hang_material m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} - m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -32,7 +32,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 m_Colors: diff --git a/Assets/arts/spines/ui/ui_main_btn_sevenday/ui_main_btn_sevenday_material.mat b/Assets/arts/spines/ui/ui_main_btn_sevenday/ui_main_btn_sevenday_material.mat index a5c58a027..fd15bf57b 100644 --- a/Assets/arts/spines/ui/ui_main_btn_sevenday/ui_main_btn_sevenday_material.mat +++ b/Assets/arts/spines/ui/ui_main_btn_sevenday/ui_main_btn_sevenday_material.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ui_main_btn_sevenday_material m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} - m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -32,7 +32,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 m_Colors: diff --git a/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1_material.mat b/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1_material.mat index 0cac9bd49..25d991723 100644 --- a/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1_material.mat +++ b/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1_material.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ui_main_button_1_material m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} - m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -32,7 +32,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 m_Colors: diff --git a/Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2_material.mat b/Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2_material.mat index e06b18afb..b1687d586 100644 --- a/Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2_material.mat +++ b/Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2_material.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ui_main_button_2_material m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} - m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -32,7 +32,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 m_Colors: diff --git a/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3_material.mat b/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3_material.mat index ca4fc3e9d..e92873997 100644 --- a/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3_material.mat +++ b/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3_material.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ui_main_button_3_material m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} - m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -32,7 +32,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 m_Colors: diff --git a/Assets/arts/spines/ui/ui_shop_box_1/ui_shop_box_1_material.mat b/Assets/arts/spines/ui/ui_shop_box_1/ui_shop_box_1_material.mat index bbae72fbd..e30a9b231 100644 --- a/Assets/arts/spines/ui/ui_shop_box_1/ui_shop_box_1_material.mat +++ b/Assets/arts/spines/ui/ui_shop_box_1/ui_shop_box_1_material.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ui_shop_box_1_material m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} - m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -32,7 +32,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 m_Colors: diff --git a/Assets/arts/spines/ui/ui_shop_box_2/ui_shop_box_2_material.mat b/Assets/arts/spines/ui/ui_shop_box_2/ui_shop_box_2_material.mat index c4e537dd4..673b069de 100644 --- a/Assets/arts/spines/ui/ui_shop_box_2/ui_shop_box_2_material.mat +++ b/Assets/arts/spines/ui/ui_shop_box_2/ui_shop_box_2_material.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ui_shop_box_2_material m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} - m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -32,7 +32,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 m_Colors: diff --git a/Assets/arts/spines/ui/ui_shop_box_3/ui_shop_box_3_material.mat b/Assets/arts/spines/ui/ui_shop_box_3/ui_shop_box_3_material.mat index d3e7dbda9..db6591ca6 100644 --- a/Assets/arts/spines/ui/ui_shop_box_3/ui_shop_box_3_material.mat +++ b/Assets/arts/spines/ui/ui_shop_box_3/ui_shop_box_3_material.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ui_shop_box_3_material m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} - m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -32,7 +32,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 m_Colors: diff --git a/Assets/arts/textures/background/battle/battle_dec_3.png b/Assets/arts/textures/background/battle/battle_dec_3.png new file mode 100644 index 000000000..5c62572d1 Binary files /dev/null and b/Assets/arts/textures/background/battle/battle_dec_3.png differ diff --git a/Assets/arts/textures/background/battle/battle_dec_3.png.meta b/Assets/arts/textures/background/battle/battle_dec_3.png.meta new file mode 100644 index 000000000..a04171274 --- /dev/null +++ b/Assets/arts/textures/background/battle/battle_dec_3.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 3ee9d506c02897948b72ddb196f1be6a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: arts/textures/background/battle/battle_dec_3.png.ab + assetBundleVariant: diff --git a/Assets/lua/app/module/login/login_ui.lua.bytes b/Assets/lua/app/module/login/login_ui.lua.bytes index 614a13050..4f38fd8bb 100644 Binary files a/Assets/lua/app/module/login/login_ui.lua.bytes and b/Assets/lua/app/module/login/login_ui.lua.bytes differ diff --git a/Assets/lua/app/net/net_manager.lua.bytes b/Assets/lua/app/net/net_manager.lua.bytes index 445661359..0a64a6d70 100644 Binary files a/Assets/lua/app/net/net_manager.lua.bytes and b/Assets/lua/app/net/net_manager.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes b/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes index 7bfd78df5..a432a4427 100644 Binary files a/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes and b/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/game_setting/game_setting_ui.lua.bytes b/Assets/lua/app/ui/game_setting/game_setting_ui.lua.bytes index 144ad948b..cb18be77e 100644 Binary files a/Assets/lua/app/ui/game_setting/game_setting_ui.lua.bytes and b/Assets/lua/app/ui/game_setting/game_setting_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/component/chapter_comp.lua.bytes b/Assets/lua/app/ui/main_city/component/chapter_comp.lua.bytes index 83b2dbcc5..e00bd2ea7 100644 Binary files a/Assets/lua/app/ui/main_city/component/chapter_comp.lua.bytes and b/Assets/lua/app/ui/main_city/component/chapter_comp.lua.bytes differ diff --git a/Assets/prefabs/effects/battle/sfx_m20010_b02.prefab.meta b/Assets/prefabs/effects/battle/sfx_m20010_b02.prefab.meta index 91e926bb5..e02a9336f 100644 --- a/Assets/prefabs/effects/battle/sfx_m20010_b02.prefab.meta +++ b/Assets/prefabs/effects/battle/sfx_m20010_b02.prefab.meta @@ -3,5 +3,5 @@ guid: 7eb6219675d0ec0469f75a3125ede0cc PrefabImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: prefabs/effects/battle/sfx_m20010_b02.prefab.ab assetBundleVariant: diff --git a/Assets/prefabs/ui/battle/battle_ui.prefab b/Assets/prefabs/ui/battle/battle_ui.prefab index be0201a08..4d0596933 100644 --- a/Assets/prefabs/ui/battle/battle_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_ui.prefab @@ -3065,6 +3065,7 @@ GameObject: m_Component: - component: {fileID: 5618677245174959657} - component: {fileID: 6292286561578627806} + - component: {fileID: 5484992828300918365} m_Layer: 5 m_Name: bg_2 m_TagString: Untagged @@ -3101,6 +3102,33 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1798807699412080662} m_CullTransparentMesh: 1 +--- !u!114 &5484992828300918365 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1798807699412080662} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 2800000, guid: 3ee9d506c02897948b72ddb196f1be6a, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &1858017628714555047 GameObject: m_ObjectHideFlags: 0 @@ -14455,16 +14483,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3} ---- !u!224 &4637104479082081270 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3} - m_PrefabInstance: {fileID: 63153399885659567} - m_PrefabAsset: {fileID: 0} --- !u!1 &4345343870430669859 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} m_PrefabInstance: {fileID: 63153399885659567} m_PrefabAsset: {fileID: 0} +--- !u!224 &4637104479082081270 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3} + m_PrefabInstance: {fileID: 63153399885659567} + m_PrefabAsset: {fileID: 0} --- !u!1001 &164396171060211616 PrefabInstance: m_ObjectHideFlags: 0 @@ -14610,16 +14638,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3} ---- !u!1 &4532191219610058284 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} - m_PrefabInstance: {fileID: 164396171060211616} - m_PrefabAsset: {fileID: 0} --- !u!224 &4823950210164062713 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3} m_PrefabInstance: {fileID: 164396171060211616} m_PrefabAsset: {fileID: 0} +--- !u!1 &4532191219610058284 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} + m_PrefabInstance: {fileID: 164396171060211616} + m_PrefabAsset: {fileID: 0} --- !u!1001 &352145542058850513 PrefabInstance: m_ObjectHideFlags: 0 @@ -14732,16 +14760,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 19f68781e20cf4a5e9d966c7126699ce, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &7942625283249203436 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7699692034021216317, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} - m_PrefabInstance: {fileID: 352145542058850513} - m_PrefabAsset: {fileID: 0} --- !u!224 &9134045761788230802 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8800513852818785347, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} m_PrefabInstance: {fileID: 352145542058850513} m_PrefabAsset: {fileID: 0} +--- !u!1 &7942625283249203436 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7699692034021216317, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} + m_PrefabInstance: {fileID: 352145542058850513} + m_PrefabAsset: {fileID: 0} --- !u!1001 &550390724268313014 PrefabInstance: m_ObjectHideFlags: 0 @@ -15367,16 +15395,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} ---- !u!1 &232038362732579711 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - m_PrefabInstance: {fileID: 1773497696756442631} - m_PrefabAsset: {fileID: 0} --- !u!224 &3489063842309262745 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} m_PrefabInstance: {fileID: 1773497696756442631} m_PrefabAsset: {fileID: 0} +--- !u!1 &232038362732579711 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 1773497696756442631} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2183942131524537344 PrefabInstance: m_ObjectHideFlags: 0 @@ -15799,16 +15827,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9bfac219775267f418c78bc75c2f536b, type: 3} ---- !u!224 &7860023574332559661 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5453798199138334034, guid: 9bfac219775267f418c78bc75c2f536b, type: 3} - m_PrefabInstance: {fileID: 2791001805797450879} - m_PrefabAsset: {fileID: 0} --- !u!1 &6840522547979230359 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8671059141782796520, guid: 9bfac219775267f418c78bc75c2f536b, type: 3} m_PrefabInstance: {fileID: 2791001805797450879} m_PrefabAsset: {fileID: 0} +--- !u!224 &7860023574332559661 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5453798199138334034, guid: 9bfac219775267f418c78bc75c2f536b, type: 3} + m_PrefabInstance: {fileID: 2791001805797450879} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2852916185352659568 PrefabInstance: m_ObjectHideFlags: 0 @@ -15910,6 +15938,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3} +--- !u!1 &8899478572343912983 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6635725003137091687, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3} + m_PrefabInstance: {fileID: 2852916185352659568} + m_PrefabAsset: {fileID: 0} --- !u!114 &8575182577441784083 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: -3416346208621223069, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3} @@ -15926,11 +15959,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 6635725003137091686, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3} m_PrefabInstance: {fileID: 2852916185352659568} m_PrefabAsset: {fileID: 0} ---- !u!1 &8899478572343912983 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6635725003137091687, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3} - m_PrefabInstance: {fileID: 2852916185352659568} - m_PrefabAsset: {fileID: 0} --- !u!1001 &2963387977643518837 PrefabInstance: m_ObjectHideFlags: 0 @@ -16150,16 +16178,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2576d47a508da8d4f910006b0fc2b393, type: 3} ---- !u!224 &1217576256522215903 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2338377368704152895, guid: 2576d47a508da8d4f910006b0fc2b393, type: 3} - m_PrefabInstance: {fileID: 3501028591294518496} - m_PrefabAsset: {fileID: 0} --- !u!1 &1580384506931628838 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2700050507860828102, guid: 2576d47a508da8d4f910006b0fc2b393, type: 3} m_PrefabInstance: {fileID: 3501028591294518496} m_PrefabAsset: {fileID: 0} +--- !u!224 &1217576256522215903 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2338377368704152895, guid: 2576d47a508da8d4f910006b0fc2b393, type: 3} + m_PrefabInstance: {fileID: 3501028591294518496} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3558904395021134129 PrefabInstance: m_ObjectHideFlags: 0 @@ -16971,16 +16999,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 946f25630e86bd847a044f0166fad320, type: 3} ---- !u!1 &73365493201545484 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4608778532194675971, guid: 946f25630e86bd847a044f0166fad320, type: 3} - m_PrefabInstance: {fileID: 4535421895216219151} - m_PrefabAsset: {fileID: 0} --- !u!224 &292648168670659573 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4251046042971981818, guid: 946f25630e86bd847a044f0166fad320, type: 3} m_PrefabInstance: {fileID: 4535421895216219151} m_PrefabAsset: {fileID: 0} +--- !u!1 &73365493201545484 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4608778532194675971, guid: 946f25630e86bd847a044f0166fad320, type: 3} + m_PrefabInstance: {fileID: 4535421895216219151} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4594038489666354068 PrefabInstance: m_ObjectHideFlags: 0 @@ -17296,16 +17324,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1385bbdcd9a6a404d9906a1f76a745cf, type: 3} ---- !u!1 &5274389685997092681 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 792060148255419897, guid: 1385bbdcd9a6a404d9906a1f76a745cf, type: 3} - m_PrefabInstance: {fileID: 4886286828465214128} - m_PrefabAsset: {fileID: 0} --- !u!224 &7560823041161074119 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3108296850535892855, guid: 1385bbdcd9a6a404d9906a1f76a745cf, type: 3} m_PrefabInstance: {fileID: 4886286828465214128} m_PrefabAsset: {fileID: 0} +--- !u!1 &5274389685997092681 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 792060148255419897, guid: 1385bbdcd9a6a404d9906a1f76a745cf, type: 3} + m_PrefabInstance: {fileID: 4886286828465214128} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4946890495658564103 PrefabInstance: m_ObjectHideFlags: 0 @@ -17412,11 +17440,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7699692034021216317, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} m_PrefabInstance: {fileID: 4946890495658564103} m_PrefabAsset: {fileID: 0} ---- !u!224 &4505664557021601348 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8800513852818785347, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} - m_PrefabInstance: {fileID: 4946890495658564103} - m_PrefabAsset: {fileID: 0} --- !u!114 &6755863407269700977 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1830510164170702710, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} @@ -17428,6 +17451,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 19f68781e20cf4a5e9d966c7126699ce, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &4505664557021601348 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8800513852818785347, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} + m_PrefabInstance: {fileID: 4946890495658564103} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4997889866541477412 PrefabInstance: m_ObjectHideFlags: 0 @@ -17636,16 +17664,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9bfac219775267f418c78bc75c2f536b, type: 3} ---- !u!1 &4398461508904942925 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8671059141782796520, guid: 9bfac219775267f418c78bc75c2f536b, type: 3} - m_PrefabInstance: {fileID: 4998911100362425765} - m_PrefabAsset: {fileID: 0} --- !u!224 &1076496341155328247 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 5453798199138334034, guid: 9bfac219775267f418c78bc75c2f536b, type: 3} m_PrefabInstance: {fileID: 4998911100362425765} m_PrefabAsset: {fileID: 0} +--- !u!1 &4398461508904942925 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8671059141782796520, guid: 9bfac219775267f418c78bc75c2f536b, type: 3} + m_PrefabInstance: {fileID: 4998911100362425765} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5351464385034910283 PrefabInstance: m_ObjectHideFlags: 0 @@ -17791,16 +17819,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3} ---- !u!1 &8568562378450594759 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} - m_PrefabInstance: {fileID: 5351464385034910283} - m_PrefabAsset: {fileID: 0} --- !u!224 &792115507450702866 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3} m_PrefabInstance: {fileID: 5351464385034910283} m_PrefabAsset: {fileID: 0} +--- !u!1 &8568562378450594759 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} + m_PrefabInstance: {fileID: 5351464385034910283} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5601310105526688421 PrefabInstance: m_ObjectHideFlags: 0 @@ -18065,16 +18093,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3} ---- !u!1 &8240790560213506744 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} - m_PrefabInstance: {fileID: 5688246229370211124} - m_PrefabAsset: {fileID: 0} --- !u!224 &1029817523774987629 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3} m_PrefabInstance: {fileID: 5688246229370211124} m_PrefabAsset: {fileID: 0} +--- !u!1 &8240790560213506744 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} + m_PrefabInstance: {fileID: 5688246229370211124} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5730118907961866331 PrefabInstance: m_ObjectHideFlags: 0 @@ -18176,16 +18204,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 946f25630e86bd847a044f0166fad320, type: 3} ---- !u!224 &8465578813000794017 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4251046042971981818, guid: 946f25630e86bd847a044f0166fad320, type: 3} - m_PrefabInstance: {fileID: 5730118907961866331} - m_PrefabAsset: {fileID: 0} --- !u!1 &8102208145725068632 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4608778532194675971, guid: 946f25630e86bd847a044f0166fad320, type: 3} m_PrefabInstance: {fileID: 5730118907961866331} m_PrefabAsset: {fileID: 0} +--- !u!224 &8465578813000794017 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4251046042971981818, guid: 946f25630e86bd847a044f0166fad320, type: 3} + m_PrefabInstance: {fileID: 5730118907961866331} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5730235785416727809 PrefabInstance: m_ObjectHideFlags: 0 @@ -18390,16 +18418,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4fc8e309637796d4d917831e70f46d2a, type: 3} ---- !u!224 &542171404184405263 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6124372206462679079, guid: 4fc8e309637796d4d917831e70f46d2a, type: 3} - m_PrefabInstance: {fileID: 6014568399738436904} - m_PrefabAsset: {fileID: 0} --- !u!1 &183867444598501366 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5905679678307275486, guid: 4fc8e309637796d4d917831e70f46d2a, type: 3} m_PrefabInstance: {fileID: 6014568399738436904} m_PrefabAsset: {fileID: 0} +--- !u!224 &542171404184405263 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6124372206462679079, guid: 4fc8e309637796d4d917831e70f46d2a, type: 3} + m_PrefabInstance: {fileID: 6014568399738436904} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6025152556865462108 PrefabInstance: m_ObjectHideFlags: 0 @@ -18497,16 +18525,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2576d47a508da8d4f910006b0fc2b393, type: 3} ---- !u!1 &8567295588681957530 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2700050507860828102, guid: 2576d47a508da8d4f910006b0fc2b393, type: 3} - m_PrefabInstance: {fileID: 6025152556865462108} - m_PrefabAsset: {fileID: 0} --- !u!224 &8353668785482033763 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2338377368704152895, guid: 2576d47a508da8d4f910006b0fc2b393, type: 3} m_PrefabInstance: {fileID: 6025152556865462108} m_PrefabAsset: {fileID: 0} +--- !u!1 &8567295588681957530 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2700050507860828102, guid: 2576d47a508da8d4f910006b0fc2b393, type: 3} + m_PrefabInstance: {fileID: 6025152556865462108} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6281625263577488710 PrefabInstance: m_ObjectHideFlags: 0 @@ -18652,16 +18680,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3} ---- !u!1 &7746559084762877130 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} - m_PrefabInstance: {fileID: 6281625263577488710} - m_PrefabAsset: {fileID: 0} --- !u!224 &1699757838083181343 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3} m_PrefabInstance: {fileID: 6281625263577488710} m_PrefabAsset: {fileID: 0} +--- !u!1 &7746559084762877130 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} + m_PrefabInstance: {fileID: 6281625263577488710} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6341536710361824361 PrefabInstance: m_ObjectHideFlags: 0 @@ -18807,16 +18835,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3} ---- !u!224 &1782222931249769008 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3} - m_PrefabInstance: {fileID: 6341536710361824361} - m_PrefabAsset: {fileID: 0} --- !u!1 &7254230955249708517 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} m_PrefabInstance: {fileID: 6341536710361824361} m_PrefabAsset: {fileID: 0} +--- !u!224 &1782222931249769008 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3} + m_PrefabInstance: {fileID: 6341536710361824361} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6585419292669032663 PrefabInstance: m_ObjectHideFlags: 0 @@ -18914,16 +18942,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4fc8e309637796d4d917831e70f46d2a, type: 3} ---- !u!1 &761437726962952713 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5905679678307275486, guid: 4fc8e309637796d4d917831e70f46d2a, type: 3} - m_PrefabInstance: {fileID: 6585419292669032663} - m_PrefabAsset: {fileID: 0} --- !u!224 &1124281315851567344 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6124372206462679079, guid: 4fc8e309637796d4d917831e70f46d2a, type: 3} m_PrefabInstance: {fileID: 6585419292669032663} m_PrefabAsset: {fileID: 0} +--- !u!1 &761437726962952713 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5905679678307275486, guid: 4fc8e309637796d4d917831e70f46d2a, type: 3} + m_PrefabInstance: {fileID: 6585419292669032663} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6794649544159706245 PrefabInstance: m_ObjectHideFlags: 0 @@ -19021,16 +19049,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3} ---- !u!1 &2704353607336334181 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8920710045876662240, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3} - m_PrefabInstance: {fileID: 6794649544159706245} - m_PrefabAsset: {fileID: 0} --- !u!224 &2316558405223436950 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 9110043562113854995, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3} m_PrefabInstance: {fileID: 6794649544159706245} m_PrefabAsset: {fileID: 0} +--- !u!1 &2704353607336334181 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8920710045876662240, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3} + m_PrefabInstance: {fileID: 6794649544159706245} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6931473696039884924 PrefabInstance: m_ObjectHideFlags: 0 @@ -19283,16 +19311,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3} ---- !u!1 &6456457455187257617 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} - m_PrefabInstance: {fileID: 7292576075314493597} - m_PrefabAsset: {fileID: 0} --- !u!224 &2706240165845954244 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3} m_PrefabInstance: {fileID: 7292576075314493597} m_PrefabAsset: {fileID: 0} +--- !u!1 &6456457455187257617 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} + m_PrefabInstance: {fileID: 7292576075314493597} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7297353101838581832 PrefabInstance: m_ObjectHideFlags: 0 @@ -19516,16 +19544,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9bfac219775267f418c78bc75c2f536b, type: 3} ---- !u!1 &2235879126498379342 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8671059141782796520, guid: 9bfac219775267f418c78bc75c2f536b, type: 3} - m_PrefabInstance: {fileID: 7445218059838062246} - m_PrefabAsset: {fileID: 0} --- !u!224 &3241873682225056756 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 5453798199138334034, guid: 9bfac219775267f418c78bc75c2f536b, type: 3} m_PrefabInstance: {fileID: 7445218059838062246} m_PrefabAsset: {fileID: 0} +--- !u!1 &2235879126498379342 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8671059141782796520, guid: 9bfac219775267f418c78bc75c2f536b, type: 3} + m_PrefabInstance: {fileID: 7445218059838062246} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7534635914639315871 PrefabInstance: m_ObjectHideFlags: 0 @@ -19627,6 +19655,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0cf1409d789221948a0722e1f0b6ac68, type: 3} +--- !u!1 &3784910217633864696 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6635725003137091687, guid: 0cf1409d789221948a0722e1f0b6ac68, type: 3} + m_PrefabInstance: {fileID: 7534635914639315871} + m_PrefabAsset: {fileID: 0} --- !u!224 &3784910217633864697 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6635725003137091686, guid: 0cf1409d789221948a0722e1f0b6ac68, type: 3} @@ -19643,11 +19676,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 19f68781e20cf4a5e9d966c7126699ce, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &3784910217633864696 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6635725003137091687, guid: 0cf1409d789221948a0722e1f0b6ac68, type: 3} - m_PrefabInstance: {fileID: 7534635914639315871} - m_PrefabAsset: {fileID: 0} --- !u!1001 &7562490370736646927 PrefabInstance: m_ObjectHideFlags: 0 @@ -19749,16 +19777,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 946f25630e86bd847a044f0166fad320, type: 3} ---- !u!1 &6270971405793822220 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4608778532194675971, guid: 946f25630e86bd847a044f0166fad320, type: 3} - m_PrefabInstance: {fileID: 7562490370736646927} - m_PrefabAsset: {fileID: 0} --- !u!224 &5912631710200966389 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4251046042971981818, guid: 946f25630e86bd847a044f0166fad320, type: 3} m_PrefabInstance: {fileID: 7562490370736646927} m_PrefabAsset: {fileID: 0} +--- !u!1 &6270971405793822220 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4608778532194675971, guid: 946f25630e86bd847a044f0166fad320, type: 3} + m_PrefabInstance: {fileID: 7562490370736646927} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8078068027231336684 PrefabInstance: m_ObjectHideFlags: 0 @@ -19856,16 +19884,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 99e579a6c3664c845a57030a7b324b3f, type: 3} ---- !u!224 &3606866461269116248 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4761775941995675060, guid: 99e579a6c3664c845a57030a7b324b3f, type: 3} - m_PrefabInstance: {fileID: 8078068027231336684} - m_PrefabAsset: {fileID: 0} --- !u!1 &1864748874822543275 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7636973753184493383, guid: 99e579a6c3664c845a57030a7b324b3f, type: 3} m_PrefabInstance: {fileID: 8078068027231336684} m_PrefabAsset: {fileID: 0} +--- !u!224 &3606866461269116248 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4761775941995675060, guid: 99e579a6c3664c845a57030a7b324b3f, type: 3} + m_PrefabInstance: {fileID: 8078068027231336684} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8559068278985568436 PrefabInstance: m_ObjectHideFlags: 0 @@ -19967,16 +19995,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} ---- !u!1 &2025817585282637961 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7699692034021216317, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} - m_PrefabInstance: {fileID: 8559068278985568436} - m_PrefabAsset: {fileID: 0} ---- !u!224 &929535894792484087 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8800513852818785347, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} - m_PrefabInstance: {fileID: 8559068278985568436} - m_PrefabAsset: {fileID: 0} --- !u!114 &8043618101018578882 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1830510164170702710, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} @@ -19988,6 +20006,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 19f68781e20cf4a5e9d966c7126699ce, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &929535894792484087 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8800513852818785347, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} + m_PrefabInstance: {fileID: 8559068278985568436} + m_PrefabAsset: {fileID: 0} +--- !u!1 &2025817585282637961 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7699692034021216317, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} + m_PrefabInstance: {fileID: 8559068278985568436} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8650151620495778642 PrefabInstance: m_ObjectHideFlags: 0 @@ -20003,6 +20031,10 @@ PrefabInstance: propertyPath: m_Name value: sfx_ui_shendeng_b01 objectReference: {fileID: 0} + - target: {fileID: 2559099993529710054, guid: ac85e3e5ad9407348b5dd30622d93042, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5067157279960473836, guid: ac85e3e5ad9407348b5dd30622d93042, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -20335,16 +20367,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 99e579a6c3664c845a57030a7b324b3f, type: 3} ---- !u!1 &1420654675666579671 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7636973753184493383, guid: 99e579a6c3664c845a57030a7b324b3f, type: 3} - m_PrefabInstance: {fileID: 8812654742754930576} - m_PrefabAsset: {fileID: 0} --- !u!224 &4060539535144423972 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4761775941995675060, guid: 99e579a6c3664c845a57030a7b324b3f, type: 3} m_PrefabInstance: {fileID: 8812654742754930576} m_PrefabAsset: {fileID: 0} +--- !u!1 &1420654675666579671 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7636973753184493383, guid: 99e579a6c3664c845a57030a7b324b3f, type: 3} + m_PrefabInstance: {fileID: 8812654742754930576} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8918699202735449755 PrefabInstance: m_ObjectHideFlags: 0 @@ -20442,16 +20474,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f7eedb9d145640d4480d379b31559783, type: 3} ---- !u!1 &6919387242390991868 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2000459851088434535, guid: f7eedb9d145640d4480d379b31559783, type: 3} - m_PrefabInstance: {fileID: 8918699202735449755} - m_PrefabAsset: {fileID: 0} --- !u!224 &6919387242390991869 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2000459851088434534, guid: f7eedb9d145640d4480d379b31559783, type: 3} m_PrefabInstance: {fileID: 8918699202735449755} m_PrefabAsset: {fileID: 0} +--- !u!1 &6919387242390991868 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2000459851088434535, guid: f7eedb9d145640d4480d379b31559783, type: 3} + m_PrefabInstance: {fileID: 8918699202735449755} + m_PrefabAsset: {fileID: 0} --- !u!1001 &9118334328579025398 PrefabInstance: m_ObjectHideFlags: 0 @@ -20553,6 +20585,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} +--- !u!224 &336468674541579701 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8800513852818785347, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} + m_PrefabInstance: {fileID: 9118334328579025398} + m_PrefabAsset: {fileID: 0} --- !u!114 &7488803974071522944 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1830510164170702710, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} @@ -20569,11 +20606,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7699692034021216317, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} m_PrefabInstance: {fileID: 9118334328579025398} m_PrefabAsset: {fileID: 0} ---- !u!224 &336468674541579701 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8800513852818785347, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} - m_PrefabInstance: {fileID: 9118334328579025398} - m_PrefabAsset: {fileID: 0} --- !u!1001 &9162792165743446020 PrefabInstance: m_ObjectHideFlags: 0 @@ -20719,13 +20751,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3} ---- !u!1 &4865392249638541704 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} - m_PrefabInstance: {fileID: 9162792165743446020} - m_PrefabAsset: {fileID: 0} --- !u!224 &4580959855365021277 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3} m_PrefabInstance: {fileID: 9162792165743446020} m_PrefabAsset: {fileID: 0} +--- !u!1 &4865392249638541704 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} + m_PrefabInstance: {fileID: 9162792165743446020} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/prefabs/ui/login/login_ui.prefab b/Assets/prefabs/ui/login/login_ui.prefab index 06b057fd7..e6f740485 100644 --- a/Assets/prefabs/ui/login/login_ui.prefab +++ b/Assets/prefabs/ui/login/login_ui.prefab @@ -441,7 +441,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3} + m_Sprite: {fileID: 21300000, guid: 0cd13a5ea8777fb4684a713c9c239ba4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1