易经宝库修改 罗浮争锋修改

TCX_dev_realOne_master hotfix/you_gu/cdn_realOneTest_and/1.1.6
PC-202302260912\Administrator 2023-12-15 14:45:10 +08:00
parent 0ca803f706
commit 109b83ed50
3 changed files with 105 additions and 20 deletions

View File

@ -1175,6 +1175,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &417823996
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 417823997}
- component: {fileID: 417823999}
- component: {fileID: 417823998}
m_Layer: 0
m_Name: proImg
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &417823997
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 417823996}
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: 8620459858479164681}
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: 177, y: 30}
m_SizeDelta: {x: 184, y: 74}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &417823999
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 417823996}
m_CullTransparentMesh: 0
--- !u!114 &417823998
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 417823996}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 71f7e8c186513a3499695d5a9a04a31f, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &518459078
GameObject:
m_ObjectHideFlags: 0
@ -3230,10 +3304,10 @@ RectTransform:
m_Father: {fileID: 1002555691}
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: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 210, y: -127.925}
m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6441804786815422722
CanvasRenderer:
@ -5568,7 +5642,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &2140040536
RectTransform:
m_ObjectHideFlags: 0
@ -13901,8 +13975,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: 73.47, y: 30}
m_SizeDelta: {x: 246.96, y: 50}
m_AnchoredPosition: {x: 40.4, y: 30}
m_SizeDelta: {x: 180.7, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1129836208852214349
CanvasRenderer:
@ -13934,10 +14008,10 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 30
m_FontSize: 25
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 0
m_AlignByGeometry: 0
@ -21588,6 +21662,7 @@ RectTransform:
- {fileID: 886790496823652559}
- {fileID: 7298586334200698570}
- {fileID: 444174996902775064}
- {fileID: 417823997}
m_Father: {fileID: 2221885512223848565}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -28021,7 +28096,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &2221885512223848565
RectTransform:
m_ObjectHideFlags: 0
@ -43500,10 +43575,10 @@ RectTransform:
m_Father: {fileID: 1002555691}
m_RootOrder: 2
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: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 590, y: -127.925}
m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2280464345083763535
CanvasRenderer:
@ -49136,10 +49211,10 @@ RectTransform:
m_Father: {fileID: 1002555691}
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: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 400, y: -127.925}
m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6714569458965818143
CanvasRenderer:

View File

@ -83,10 +83,18 @@ function this:SetSingleData(index,item,data)
local limit1 = Util.GetGameObject(item,"limit1"):GetComponent("Text")
local limit2 = Util.GetGameObject(item,"limit2"):GetComponent("Text")
local select = Util.GetGameObject(item,"select")
local proImg=Util.GetGameObject(item,"proImg"):GetComponent("Image")
if data.Discount>0 then
proImg.gameObject:SetActive(true)
proImg.sprite=this.spLoader:LoadSprite("s_shop_zhekou_0"..data.Discount.."_zh")
else
proImg.gameObject:SetActive(false)
end
local go = Util.GetGameObject(item,"select/Go")
goList[index] = go
item:SetActive(true)
if not itemIconList[item] then
local view = SubUIManager.Open(SubUIConfig.ItemView, icon.transform)

View File

@ -38,7 +38,9 @@ end
---初始化
function this.GetWorldArenaInfoRequest(fun)
NetManager.GetWorldArenaInfoRequest(function(_msg)
this.InithightLadderData(_msg)
if _msg then
this.InithightLadderData(_msg)
end
Game.GlobalEvent:DispatchEvent(GameEvent.JumpServerHeightLadder.UpdateHeightLadderPanel)
if fun then
fun()