formation commit

dev_chengFeng
jiaoyangna 2020-07-25 22:58:55 +08:00
parent b1bf2876cb
commit 48c209b4aa
6 changed files with 1740 additions and 48516 deletions

View File

@ -1,5 +1,80 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &584892762679525857
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1051656819208556112}
- component: {fileID: 8743653308438433369}
- component: {fileID: 9192249603128165987}
m_Layer: 5
m_Name: starPre (16)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &1051656819208556112
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 584892762679525857}
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:
- {fileID: 2016497424707099067}
m_Father: {fileID: 2320031820122894204}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 110.139496, y: 1.2465}
m_SizeDelta: {x: 32.493, y: 32.493}
m_Pivot: {x: 0, y: 1}
--- !u!222 &8743653308438433369
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 584892762679525857}
m_CullTransparentMesh: 0
--- !u!114 &9192249603128165987
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 584892762679525857}
m_Enabled: 0
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: 8908080ead3926f4e9e9951397b9e29b, 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 &757563530012435947
GameObject:
m_ObjectHideFlags: 0
@ -257,7 +332,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 58.906994, y: 1.2465}
m_AnchoredPosition: {x: 48.660496, y: 1.2465}
m_SizeDelta: {x: 32.493, y: 32.493}
m_Pivot: {x: 0, y: 1}
--- !u!222 &2320031818097329355
@ -332,7 +407,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 62.160496, y: 1.2465}
m_AnchoredPosition: {x: 48.660496, y: 1.2465}
m_SizeDelta: {x: 32.493, y: 32.493}
m_Pivot: {x: 0, y: 1}
--- !u!222 &2320031818242639341
@ -629,7 +704,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 79.399994, y: 1.2465}
m_AnchoredPosition: {x: 69.153496, y: 1.2465}
m_SizeDelta: {x: 32.493, y: 32.493}
m_Pivot: {x: 0, y: 1}
--- !u!222 &2320031818590170636
@ -1070,7 +1145,7 @@ RectTransform:
m_Children:
- {fileID: 2320031819195525549}
m_Father: {fileID: 2320031820122894204}
m_RootOrder: 13
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -1223,7 +1298,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 41.667496, y: 1.2465}
m_AnchoredPosition: {x: 28.167496, y: 1.2465}
m_SizeDelta: {x: 32.493, y: 32.493}
m_Pivot: {x: 0, y: 1}
--- !u!222 &2320031818902343616
@ -1298,7 +1373,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 38.413994, y: 1.2465}
m_AnchoredPosition: {x: 28.167496, y: 1.2465}
m_SizeDelta: {x: 32.493, y: 32.493}
m_Pivot: {x: 0, y: 1}
--- !u!222 &2320031818921221044
@ -1370,10 +1445,10 @@ RectTransform:
m_Father: {fileID: 2320031819818155156}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -1.2, y: 5.15}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2320031819088404997
CanvasRenderer:
@ -1447,7 +1522,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 82.653496, y: 1.2465}
m_AnchoredPosition: {x: 69.153496, y: 1.2465}
m_SizeDelta: {x: 32.493, y: 32.493}
m_Pivot: {x: 0, y: 1}
--- !u!222 &2320031819123426389
@ -1670,7 +1745,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 123.639496, y: 1.2465}
m_AnchoredPosition: {x: 110.139496, y: 1.2465}
m_SizeDelta: {x: 32.493, y: 32.493}
m_Pivot: {x: 0, y: 1}
--- !u!222 &2320031819291926011
@ -2123,7 +2198,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 103.1465, y: 1.2465}
m_AnchoredPosition: {x: 89.6465, y: 1.2465}
m_SizeDelta: {x: 32.493, y: 32.493}
m_Pivot: {x: 0, y: 1}
--- !u!222 &2320031819610280430
@ -2270,7 +2345,7 @@ RectTransform:
m_Children:
- {fileID: 2320031820207909310}
m_Father: {fileID: 2320031820122894204}
m_RootOrder: 12
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -2345,7 +2420,7 @@ RectTransform:
m_Children:
- {fileID: 2320031819916146513}
m_Father: {fileID: 2320031820122894204}
m_RootOrder: 10
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -2420,12 +2495,12 @@ RectTransform:
m_Children:
- {fileID: 2320031819088404999}
m_Father: {fileID: 2320031820122894204}
m_RootOrder: 9
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 60.822495, y: 9.577499}
m_SizeDelta: {x: 49.155, y: 49.155}
m_AnchoredPosition: {x: 45.399994, y: 25}
m_SizeDelta: {x: 80, y: 80}
m_Pivot: {x: 0, y: 1}
--- !u!222 &2320031819818155162
CanvasRenderer:
@ -2442,7 +2517,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2320031819818155157}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
@ -2455,7 +2530,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: abae95ba31b5b5a4fa83a82d0c56db63, type: 3}
m_Sprite: {fileID: 21300000, guid: 65d9f3e687e9f194cbbf7570d02020b6, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -2724,6 +2799,7 @@ RectTransform:
- {fileID: 2320031818242639343}
- {fileID: 2320031819123426391}
- {fileID: 2320031819610280424}
- {fileID: 1051656819208556112}
- {fileID: 2320031819818155156}
- {fileID: 2320031819795124046}
- {fileID: 2320031820163869943}
@ -2800,7 +2876,7 @@ RectTransform:
m_Children:
- {fileID: 2320031818794305969}
m_Father: {fileID: 2320031820122894204}
m_RootOrder: 14
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -2875,7 +2951,7 @@ RectTransform:
m_Children:
- {fileID: 2320031818352649172}
m_Father: {fileID: 2320031820122894204}
m_RootOrder: 11
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -3028,7 +3104,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 99.89299, y: 1.2465}
m_AnchoredPosition: {x: 89.6465, y: 1.2465}
m_SizeDelta: {x: 32.493, y: 32.493}
m_Pivot: {x: 0, y: 1}
--- !u!222 &2320031820211446152
@ -4040,3 +4116,77 @@ MonoBehaviour:
m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &9020638000973603085
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2016497424707099067}
- component: {fileID: 5977624225239214421}
- component: {fileID: 1868225740036272686}
m_Layer: 5
m_Name: star
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2016497424707099067
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9020638000973603085}
m_LocalRotation: {x: 0, y: 0, z: -0.13052624, w: 0.9914449}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1051656819208556112}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -15}
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: 25, y: 25}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5977624225239214421
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9020638000973603085}
m_CullTransparentMesh: 0
--- !u!114 &1868225740036272686
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9020638000973603085}
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: 530bdd8705cf0c841b413c2c589ac956, 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

View File

@ -193,7 +193,7 @@ GetHeroCardStarFg = {
[7] = "t_zhandoukuang_hong002",
[8] = "t_zhandoukuang_hong002",
[9] = "t_zhandoukuang_hong002",
[10] = "t_zhandoukuang_zhuangshi002",
[10] = "t_zhandoukuang_hong002",
[11] = "t_zhandoukuang_zhuangshi002",
[12] = "t_zhandoukuang_zhuangshi002",
[13] = "t_zhandoukuang_zhuangshi002",
@ -214,7 +214,7 @@ GetHeroCardStarZs = {
[7] = "t_zhandoukuang_hong01",
[8] = "t_zhandoukuang_hong01",
[9] = "t_zhandoukuang_hong01",
[10] = "t_zhandoukuang_zhuanshi01",
[10] = "t_zhandoukuang_hong01",
[11] = "t_zhandoukuang_zhuanshi01",
[12] = "t_zhandoukuang_zhuanshi01",
[13] = "t_zhandoukuang_zhuanshi01",

View File

@ -438,7 +438,7 @@ function SetCardStars(starGrid, star)
starGrid.transform:GetChild(5 + i - 1).gameObject:SetActive(true)
end
elseif star > 9 then
starGrid.transform:GetChild(star - 1).gameObject:SetActive(true)
starGrid.transform:GetChild(star).gameObject:SetActive(true)
end
end
-- 在给定节点下加载预设, 返回实例化的预设

View File

@ -23,7 +23,7 @@ function this:InitComponent(gameObject)
--滚动条根节点
this.root = Util.GetGameObject(gameObject, "Root")
for i = 1, 6 do
heroListGo[i] = Util.GetGameObject(gameObject, "RoleGrid/Bg"..i.."/Hero1")
heroListGo[i] = Util.GetGameObject(gameObject, "RoleGrid/Bg"..i.."/Hero"..i)
end
this.backBtn=Util.GetGameObject(gameObject,"BackBtn")
end