【山河社稷图】bug
parent
aca4aa47ac
commit
dbee1bef07
|
@ -772,9 +772,9 @@ RectTransform:
|
|||
m_Father: {fileID: 2461825146493731649}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: -101, y: 112.700195}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -85.29999, y: -307}
|
||||
m_SizeDelta: {x: 126, y: 126}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5508371999346996025
|
||||
|
@ -1548,10 +1548,10 @@ RectTransform:
|
|||
m_Father: {fileID: 2461825146493731649}
|
||||
m_RootOrder: 5
|
||||
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: 459.6, y: 759.05}
|
||||
m_SizeDelta: {x: 70.74, y: 70.74}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -83.1, y: -200.95001}
|
||||
m_SizeDelta: {x: 70.73999, y: 70.73999}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5508372000661152925
|
||||
CanvasRenderer:
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1392,7 +1392,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -417.785, y: -629}
|
||||
m_SizeDelta: {x: 0, y: 85.3}
|
||||
m_SizeDelta: {x: 218, y: 85.3}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &1130095560766840135
|
||||
MonoBehaviour:
|
||||
|
@ -2443,6 +2443,86 @@ MonoBehaviour:
|
|||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 1
|
||||
m_ChildControlHeight: 0
|
||||
--- !u!1 &2144864763650503093
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3734712778851432214}
|
||||
- component: {fileID: 1498924668911105406}
|
||||
- component: {fileID: 7073670466172294939}
|
||||
m_Layer: 5
|
||||
m_Name: FightLeve
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &3734712778851432214
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2144864763650503093}
|
||||
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_Children: []
|
||||
m_Father: {fileID: 8005078814990617335}
|
||||
m_RootOrder: 6
|
||||
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: -60.78, y: 0.0000029206276}
|
||||
m_SizeDelta: {x: 300.59998, y: 41.9}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1498924668911105406
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2144864763650503093}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &7073670466172294939
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2144864763650503093}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.9372549, g: 0.8, b: 0.7411765, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 36
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 5
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u70BC\u72F15-5"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &2174753942525619371
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -2877,7 +2957,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: -131.6, y: -1.000012}
|
||||
m_AnchoredPosition: {x: -185, y: -1.000012}
|
||||
m_SizeDelta: {x: 0, y: 79.69}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &8701268240454309343
|
||||
|
@ -4365,6 +4445,7 @@ RectTransform:
|
|||
- {fileID: 22212772915628204}
|
||||
- {fileID: 6180126458437762376}
|
||||
- {fileID: 7322753828271691929}
|
||||
- {fileID: 4161910692602920021}
|
||||
m_Father: {fileID: 6913215175904765234}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -5036,7 +5117,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: -9.5, y: 0}
|
||||
m_AnchoredPosition: {x: -21.67, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 79.69}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &297011977991261245
|
||||
|
@ -6327,10 +6408,10 @@ RectTransform:
|
|||
m_Father: {fileID: 2001157856481278792}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 60.16}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 90, y: -42.65}
|
||||
m_SizeDelta: {x: 180, y: 60.16}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7166038892101886920
|
||||
CanvasRenderer:
|
||||
|
@ -6490,7 +6571,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: -77.8, y: -12.8}
|
||||
m_AnchoredPosition: {x: -17, y: -12.8}
|
||||
m_SizeDelta: {x: 0, y: 79.69}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &3879638714945757083
|
||||
|
@ -6626,6 +6707,86 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &6695962331636115301
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4161910692602920021}
|
||||
- component: {fileID: 6456931202333286126}
|
||||
- component: {fileID: 8593010245683877475}
|
||||
m_Layer: 5
|
||||
m_Name: FightLeve
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &4161910692602920021
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6695962331636115301}
|
||||
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_Children: []
|
||||
m_Father: {fileID: 2523305836579646123}
|
||||
m_RootOrder: 6
|
||||
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: -54, y: 0.000034570694}
|
||||
m_SizeDelta: {x: 300.59998, y: 41.9}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6456931202333286126
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6695962331636115301}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &8593010245683877475
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6695962331636115301}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.9372549, g: 0.8, b: 0.7411765, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 36
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 5
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u70BC\u72F15-5"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &6746632470633139402
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -6918,6 +7079,86 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_textSpacing: -30.8
|
||||
--- !u!1 &7242771113073424909
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 877776905871896781}
|
||||
- component: {fileID: 367780821966041033}
|
||||
- component: {fileID: 9171175208256198463}
|
||||
m_Layer: 5
|
||||
m_Name: FightLeve
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &877776905871896781
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7242771113073424909}
|
||||
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_Children: []
|
||||
m_Father: {fileID: 3128544740893925850}
|
||||
m_RootOrder: 6
|
||||
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: 28, y: -0.0000038146973}
|
||||
m_SizeDelta: {x: 300.59998, y: 41.9}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &367780821966041033
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7242771113073424909}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &9171175208256198463
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7242771113073424909}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.9372549, g: 0.8, b: 0.7411765, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 36
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u70BC\u72F15-5"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &7291039171695906314
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -6950,10 +7191,10 @@ RectTransform:
|
|||
m_Father: {fileID: 2001157856481278792}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 47.44}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 199, y: -42.65}
|
||||
m_SizeDelta: {x: 38, y: 47.44}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7359409015438545450
|
||||
CanvasRenderer:
|
||||
|
@ -7031,6 +7272,7 @@ RectTransform:
|
|||
- {fileID: 1413035867192391530}
|
||||
- {fileID: 1481089219919317021}
|
||||
- {fileID: 2488897721936440943}
|
||||
- {fileID: 3734712778851432214}
|
||||
m_Father: {fileID: 3542290585148391186}
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -8358,6 +8600,7 @@ RectTransform:
|
|||
- {fileID: 1259383958670576891}
|
||||
- {fileID: 5102867911860676314}
|
||||
- {fileID: 5896565808654764326}
|
||||
- {fileID: 877776905871896781}
|
||||
m_Father: {fileID: 8830212790296371356}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
|
@ -261,7 +261,11 @@ function this.MonsterCampBattle(id,type,func)
|
|||
end)
|
||||
end
|
||||
function this.CarbonRedCheck()
|
||||
return this.GetCanBattleCount() > 0
|
||||
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.MONSTER_COMING) then
|
||||
return this.GetCanBattleCount() > 0
|
||||
else
|
||||
return false
|
||||
end
|
||||
end
|
||||
|
||||
return this
|
|
@ -378,12 +378,14 @@ function this.CheckTabCtrlIsLockS(type,des)
|
|||
end
|
||||
function this.SetInfoShow(go,data,rankType,Value0)
|
||||
local fight = Util.GetGameObject(go,"fight")
|
||||
local FightLeve = Util.GetGameObject(go,"FightLeve")
|
||||
local warPower = Util.GetGameObject(go,"warPower")
|
||||
local trial = Util.GetGameObject(go,"trial")
|
||||
local goldExper = Util.GetGameObject(go,"goldExper")
|
||||
local arenaScore = Util.GetGameObject(go,"arenaScore")
|
||||
local FightLeveStar = Util.GetGameObject(go,"FightLeveStar")
|
||||
fight:SetActive(false)
|
||||
FightLeve:SetActive(false)
|
||||
warPower:SetActive(false)
|
||||
trial:SetActive(false)
|
||||
goldExper:SetActive(false)
|
||||
|
@ -487,11 +489,11 @@ function this.SetInfoShow(go,data,rankType,Value0)
|
|||
elseif rankType == RANK_TYPE.FIGHTLEVEL_PROGRESS then--山河社稷图进度
|
||||
LogYellow("data.rankInfo.param1 "..data.rankInfo.param1)
|
||||
if data.rankInfo.param1 and data.rankInfo.param1 > 0 then
|
||||
fight:SetActive(true)
|
||||
FightLeve:SetActive(true)
|
||||
if Value0 then
|
||||
Value0:GetComponent("Text").text = "<size=40%>"..data.userName.."</size>"
|
||||
end
|
||||
fight:GetComponent("Text").text = GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.HardStage,data.rankInfo.param1).Name)
|
||||
FightLeve:GetComponent("Text").text = GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.HardStage,data.rankInfo.param1).Name)
|
||||
end
|
||||
elseif rankType == RANK_TYPE.FIGHTLEVEL_STAR then--山河社稷图星星
|
||||
if data.rankInfo.param1 and data.rankInfo.param1 > 0 then
|
||||
|
|
Loading…
Reference in New Issue