Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
43c4c159ed
|
@ -278,7 +278,7 @@ MonoBehaviour:
|
||||||
m_PressedTrigger: Pressed
|
m_PressedTrigger: Pressed
|
||||||
m_DisabledTrigger: Disabled
|
m_DisabledTrigger: Disabled
|
||||||
m_Interactable: 1
|
m_Interactable: 1
|
||||||
m_TargetGraphic: {fileID: 0}
|
m_TargetGraphic: {fileID: 7180480316198442812}
|
||||||
m_OnClick:
|
m_OnClick:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
|
@ -360,8 +360,8 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: -268.1, y: 469.3}
|
m_AnchoredPosition: {x: -268.1, y: 434.7}
|
||||||
m_SizeDelta: {x: 274, y: 300}
|
m_SizeDelta: {x: 274, y: 241.5}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &2919010425323436214
|
--- !u!222 &2919010425323436214
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -407,7 +407,7 @@ MonoBehaviour:
|
||||||
m_PressedTrigger: Pressed
|
m_PressedTrigger: Pressed
|
||||||
m_DisabledTrigger: Disabled
|
m_DisabledTrigger: Disabled
|
||||||
m_Interactable: 1
|
m_Interactable: 1
|
||||||
m_TargetGraphic: {fileID: 0}
|
m_TargetGraphic: {fileID: 2616828843611983892}
|
||||||
m_OnClick:
|
m_OnClick:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
|
@ -758,7 +758,7 @@ MonoBehaviour:
|
||||||
m_PressedTrigger: Pressed
|
m_PressedTrigger: Pressed
|
||||||
m_DisabledTrigger: Disabled
|
m_DisabledTrigger: Disabled
|
||||||
m_Interactable: 1
|
m_Interactable: 1
|
||||||
m_TargetGraphic: {fileID: 0}
|
m_TargetGraphic: {fileID: 6346546485856201853}
|
||||||
m_OnClick:
|
m_OnClick:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
|
@ -840,8 +840,8 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: -295.9, y: -40.9}
|
m_AnchoredPosition: {x: -295.9, y: -75.1}
|
||||||
m_SizeDelta: {x: 250, y: 400}
|
m_SizeDelta: {x: 250, y: 468.5}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &4208572497002420159
|
--- !u!222 &4208572497002420159
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -1090,7 +1090,7 @@ MonoBehaviour:
|
||||||
m_PressedTrigger: Pressed
|
m_PressedTrigger: Pressed
|
||||||
m_DisabledTrigger: Disabled
|
m_DisabledTrigger: Disabled
|
||||||
m_Interactable: 1
|
m_Interactable: 1
|
||||||
m_TargetGraphic: {fileID: 0}
|
m_TargetGraphic: {fileID: 5446762531847647535}
|
||||||
m_OnClick:
|
m_OnClick:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
|
@ -2407,7 +2407,7 @@ MonoBehaviour:
|
||||||
m_PressedTrigger: Pressed
|
m_PressedTrigger: Pressed
|
||||||
m_DisabledTrigger: Disabled
|
m_DisabledTrigger: Disabled
|
||||||
m_Interactable: 1
|
m_Interactable: 1
|
||||||
m_TargetGraphic: {fileID: 0}
|
m_TargetGraphic: {fileID: 5036688087282659812}
|
||||||
m_OnClick:
|
m_OnClick:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
|
@ -3479,7 +3479,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 34}
|
||||||
m_SizeDelta: {x: 100, y: 100}
|
m_SizeDelta: {x: 100, y: 100}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!1 &6359389777143201629
|
--- !u!1 &6359389777143201629
|
||||||
|
@ -3888,7 +3888,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 34}
|
||||||
m_SizeDelta: {x: 100, y: 100}
|
m_SizeDelta: {x: 100, y: 100}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!1 &7703640978867281762
|
--- !u!1 &7703640978867281762
|
||||||
|
@ -4398,7 +4398,7 @@ MonoBehaviour:
|
||||||
m_PressedTrigger: Pressed
|
m_PressedTrigger: Pressed
|
||||||
m_DisabledTrigger: Disabled
|
m_DisabledTrigger: Disabled
|
||||||
m_Interactable: 1
|
m_Interactable: 1
|
||||||
m_TargetGraphic: {fileID: 0}
|
m_TargetGraphic: {fileID: 4497440218633784089}
|
||||||
m_OnClick:
|
m_OnClick:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
|
|
|
@ -33,7 +33,7 @@ local carbonData = {
|
||||||
id = FUNCTION_OPEN_TYPE.MONSTER_COMING, --心魔
|
id = FUNCTION_OPEN_TYPE.MONSTER_COMING, --心魔
|
||||||
objName = "monster",
|
objName = "monster",
|
||||||
nameImg = "f_fuben_fubenming_04",
|
nameImg = "f_fuben_fubenming_04",
|
||||||
btnPos = Vector2(-39,-110),
|
btnPos = Vector2(0,-50),
|
||||||
redPointType = RedPointType.EpicExplore,
|
redPointType = RedPointType.EpicExplore,
|
||||||
effect1 = "Fx_XinMoShiLian",
|
effect1 = "Fx_XinMoShiLian",
|
||||||
effect2 = "Fx_XinMoShiLian_S",
|
effect2 = "Fx_XinMoShiLian_S",
|
||||||
|
@ -51,7 +51,7 @@ local carbonData = {
|
||||||
id = FUNCTION_OPEN_TYPE.FIGHTLEVEL, --山河社稷图
|
id = FUNCTION_OPEN_TYPE.FIGHTLEVEL, --山河社稷图
|
||||||
objName = "fightlevel",
|
objName = "fightlevel",
|
||||||
nameImg = "f_fuben_fubenming_07",
|
nameImg = "f_fuben_fubenming_07",
|
||||||
btnPos = Vector2(5,-224),
|
btnPos = Vector2(0,-167),
|
||||||
redPointType = RedPointType.FightLevel,
|
redPointType = RedPointType.FightLevel,
|
||||||
effect1 = "ImgBg/Fx_ShanHeSheJiTu",
|
effect1 = "ImgBg/Fx_ShanHeSheJiTu",
|
||||||
effect2 = "Fx_ShanHeSheJiTu_S",
|
effect2 = "Fx_ShanHeSheJiTu_S",
|
||||||
|
|
Loading…
Reference in New Issue