Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
commit
90e1c0fcc2
|
|
@ -367,8 +367,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 2.4, y: -1.29}
|
||||
m_SizeDelta: {x: 147.04, y: 84.2}
|
||||
m_AnchoredPosition: {x: -2.62, y: 2.42}
|
||||
m_SizeDelta: {x: 189.76, y: 91.62}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &611977696163508000
|
||||
CanvasRenderer:
|
||||
|
|
@ -391,7 +391,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.9490197, g: 0.91372555, b: 0.79215693, a: 1}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
|
@ -399,7 +399,7 @@ MonoBehaviour:
|
|||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
|
||||
m_FontSize: 51
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 1
|
||||
|
|
@ -725,8 +725,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 50}
|
||||
m_SizeDelta: {x: 0, y: 100}
|
||||
m_AnchoredPosition: {x: 0, y: 64.499985}
|
||||
m_SizeDelta: {x: 0, y: 129}
|
||||
m_Pivot: {x: 1, y: 0.5}
|
||||
--- !u!114 &455843809901100221
|
||||
MonoBehaviour:
|
||||
|
|
@ -859,8 +859,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 2.44, y: -1.82}
|
||||
m_SizeDelta: {x: 184, y: 126.35}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 205, y: 109}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8644410507718093528
|
||||
CanvasRenderer:
|
||||
|
|
@ -890,8 +890,8 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: dcab34f84847d94448b245ab7e62e44e, type: 3}
|
||||
m_Type: 1
|
||||
m_Sprite: {fileID: 21300000, guid: a0197572fad951f42aea1fe738f49ab6, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
|
|
@ -1128,8 +1128,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 867, y: 131}
|
||||
m_SizeDelta: {x: 184, y: 126.35}
|
||||
m_AnchoredPosition: {x: 1194, y: 131}
|
||||
m_SizeDelta: {x: 205, y: 109}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3110126848742331613
|
||||
CanvasRenderer:
|
||||
|
|
@ -1159,8 +1159,8 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 0e97e3866623faa4fa4a58ebb054267c, type: 3}
|
||||
m_Type: 1
|
||||
m_Sprite: {fileID: 21300000, guid: e1443944b35bf714c9f3a8758f1a4673, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
|
|
@ -2746,8 +2746,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 1332, y: -52.235}
|
||||
m_SizeDelta: {x: 159.29, y: 104.07}
|
||||
m_AnchoredPosition: {x: 1594, y: -52.235}
|
||||
m_SizeDelta: {x: 205, y: 109}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4770590556367807517
|
||||
CanvasRenderer:
|
||||
|
|
@ -2853,7 +2853,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 64.64497, y: 37.034996}
|
||||
m_AnchoredPosition: {x: 87.8, y: 38.6}
|
||||
m_SizeDelta: {x: 30, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1536775684161593866
|
||||
|
|
@ -3005,8 +3005,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 50.100098}
|
||||
m_SizeDelta: {x: 806.3, y: 100.2}
|
||||
m_AnchoredPosition: {x: 0, y: 111}
|
||||
m_SizeDelta: {x: 806.3, y: 129}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &3105191926613661990
|
||||
MonoBehaviour:
|
||||
|
|
@ -3161,15 +3161,15 @@ RectTransform:
|
|||
m_GameObject: {fileID: 9011176422332360032}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_LocalScale: {x: 1.3, y: 1.3, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1994294546225590454}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 106, y: 74}
|
||||
m_AnchoredPosition: {x: 0, y: 5}
|
||||
m_SizeDelta: {x: 62, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6316141985379437530
|
||||
CanvasRenderer:
|
||||
|
|
@ -3199,7 +3199,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 8f797b996c03faa4abffb3134701a8bc, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 5c16b7c9bbf6baa44b676d2aea07af8f, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
|
|||
|
|
@ -8,29 +8,29 @@ local redPointList = {}
|
|||
local TabBox = require("Modules/Common/TabBox")
|
||||
local tabs = {
|
||||
[1] = { --神将
|
||||
default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = Language[12274],
|
||||
rpType = RedPointType.Hero_Fetter,funcType = -1,bg = "t_tianshumijuan_shengjiangditu",zi = "t_tianshumijuan_shenjiangpian_zi_zh",
|
||||
default = "UI_hz_zhonghe01_83", lock = "UI_hz_zhonghe01_83", select = "UI_hz_zhonghe01_82",tabName = Language[12274],
|
||||
rpType = RedPointType.Hero_Fetter,funcType = -1,bg = "GSX116",zi = "t_tianshumijuan_shenjiangpian_zi_zh",
|
||||
},
|
||||
[2] = { --魂印
|
||||
default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = Language[12275],
|
||||
rpType = RedPointType.SoulPrint_Fetter,funcType = FUNCTION_OPEN_TYPE.hunyin,bg = "t_tianshumijuan_hunyinditu",zi = "t_tianshumijuan_hunyingpian_zi_zh", --gamesetting.EquipSignUnlock
|
||||
default = "UI_hz_zhonghe01_83", lock = "UI_hz_zhonghe01_83", select = "UI_hz_zhonghe01_82",tabName = Language[12275],
|
||||
rpType = RedPointType.SoulPrint_Fetter,funcType = FUNCTION_OPEN_TYPE.hunyin,bg = "GSX116",zi = "t_tianshumijuan_hunyingpian_zi_zh", --gamesetting.EquipSignUnlock
|
||||
},
|
||||
[3] = { --灵兽
|
||||
default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = Language[12276],
|
||||
default = "UI_hz_zhonghe01_83", lock = "UI_hz_zhonghe01_83", select = "UI_hz_zhonghe01_82",tabName = Language[12276],
|
||||
rpType = RedPointType.TianShuPokemon_Fetter,funcType = FUNCTION_OPEN_TYPE.POKEMON,bg = "GSX116",zi = "t_tianshumijuan_lingshoupian_zi_zh",
|
||||
},
|
||||
-- [4] = { --装备
|
||||
-- default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = "装备篇",
|
||||
-- default = "UI_hz_zhonghe01_83", lock = "UI_hz_zhonghe01_83", select = "UI_hz_zhonghe01_82",tabName = "装备篇",
|
||||
-- rpType = RedPointType.Equip_Fetter,funcType = FUNCTION_OPEN_TYPE.COMPOUND,bg = "t_tianshumijuan_shengjiangditu",zi = "t_tianshumijuan_zhuangbeipian_zi_zh",
|
||||
-- },
|
||||
[5] = { --神兵
|
||||
default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = "超级武器篇",
|
||||
default = "UI_hz_zhonghe01_83", lock = "UI_hz_zhonghe01_83", select = "UI_hz_zhonghe01_82",tabName = "超级武器篇",
|
||||
rpType = RedPointType.Weapon_Fetter,funcType = FUNCTION_OPEN_TYPE.POKEMON,bg = "GSX116",zi = "GodWeaponAtlas_handbook_title_zh",
|
||||
},
|
||||
[6] = { --法宝
|
||||
default = "r_hero_xuanze_002",
|
||||
lock = "r_hero_xuanze_002",
|
||||
select = "r_hero_xuanze_001",
|
||||
default = "UI_hz_zhonghe01_83",
|
||||
lock = "UI_hz_zhonghe01_83",
|
||||
select = "UI_hz_zhonghe01_82",
|
||||
tabName = "法宝",
|
||||
rpType = RedPointType.Treasure_Fetter,
|
||||
funcType = -1,
|
||||
|
|
@ -39,9 +39,9 @@ local tabs = {
|
|||
zi = "GodWeaponAtlas_handbook_title_zh",
|
||||
},
|
||||
[7] = { --法相
|
||||
default = "r_hero_xuanze_002",
|
||||
lock = "r_hero_xuanze_002",
|
||||
select = "r_hero_xuanze_001",
|
||||
default = "UI_hz_zhonghe01_83",
|
||||
lock = "UI_hz_zhonghe01_83",
|
||||
select = "UI_hz_zhonghe01_82",
|
||||
tabName = "法相",
|
||||
rpType = RedPointType.FaXiang_Fetter,
|
||||
funcType = FUNCTION_OPEN_TYPE.FaXiang,
|
||||
|
|
@ -50,9 +50,9 @@ local tabs = {
|
|||
zi = "GodWeaponAtlas_handbook_title_zh",
|
||||
},
|
||||
[8] = { --身外化身
|
||||
default = "r_hero_xuanze_002",
|
||||
lock = "r_hero_xuanze_002",
|
||||
select = "r_hero_xuanze_001",
|
||||
default = "UI_hz_zhonghe01_83",
|
||||
lock = "UI_hz_zhonghe01_83",
|
||||
select = "UI_hz_zhonghe01_82",
|
||||
tabName = "身外化身",
|
||||
rpType = RedPointType.HuaShen_Fetter,
|
||||
funcType = FUNCTION_OPEN_TYPE.Incarnation,
|
||||
|
|
|
|||
Loading…
Reference in New Issue