main更新接入商城
This commit is contained in:
parent
1435ce2043
commit
e89891e582
@ -8601,7 +8601,7 @@ MonoBehaviour:
|
|||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
retbutton: {fileID: 0}
|
retbutton: {fileID: 0}
|
||||||
ClosureObj: {fileID: 0}
|
ClosureObj: {fileID: 0}
|
||||||
Panel: {fileID: 6389689318277710002, guid: 21918674044dc0640af7d47f2617dca5, type: 3}
|
Panel: {fileID: 5449552263403658889, guid: 21918674044dc0640af7d47f2617dca5, type: 3}
|
||||||
CloseBTN: {fileID: 0}
|
CloseBTN: {fileID: 0}
|
||||||
btn: {fileID: 1588445222}
|
btn: {fileID: 1588445222}
|
||||||
canvas: {fileID: 278122028}
|
canvas: {fileID: 278122028}
|
||||||
|
@ -26,8 +26,8 @@ public class main_shop :BaseUIPanel
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// 实例化 Panel 并设置缩放为 0.5
|
// 实例化 Panel 并设置缩放为 0.5
|
||||||
GameObject newPanel = GameObject.Instantiate(Panel, canvas.transform);
|
GameObject.Instantiate(Panel, canvas.transform);
|
||||||
newPanel.transform.localScale = new Vector3(0.5f, 0.5f, 0.5f);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -27,11 +27,8 @@ public class itemInfo : MonoBehaviour
|
|||||||
void Start()
|
void Start()
|
||||||
{
|
{
|
||||||
btn.onClick.AddListener(()=> {
|
btn.onClick.AddListener(()=> {
|
||||||
if (prefab.GetComponent<BaseUIPanel>()==null)
|
|
||||||
{
|
GameObject.Instantiate(prefab,GameObject.Find("Canvas").transform);
|
||||||
Debug.LogError("prefab.GetComponent<BaseUIPanel>()==null");
|
|
||||||
}
|
|
||||||
prefab.GetComponent<BaseUIPanel>().ShopPanel();
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ using System.Threading.Tasks;
|
|||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using DG.Tweening;
|
using DG.Tweening;
|
||||||
|
|
||||||
public class shopPanel :MonoBehaviour
|
public class shopPanel: ui_huodong
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,5 +1,81 @@
|
|||||||
%YAML 1.1
|
%YAML 1.1
|
||||||
%TAG !u! tag:unity3d.com,2011:
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!1 &1076551916014715852
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 113360677477337524}
|
||||||
|
- component: {fileID: 793175939752334175}
|
||||||
|
- component: {fileID: 122354610771926069}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Image
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &113360677477337524
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1076551916014715852}
|
||||||
|
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_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 5126270615579512174}
|
||||||
|
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_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &793175939752334175
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1076551916014715852}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &122354610771926069
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1076551916014715852}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_Sprite: {fileID: 0}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
|
m_PixelsPerUnitMultiplier: 1
|
||||||
--- !u!1 &1295120164864468336
|
--- !u!1 &1295120164864468336
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -31,7 +107,7 @@ RectTransform:
|
|||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 5126270615579512174}
|
m_Father: {fileID: 5126270615579512174}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
@ -263,7 +339,7 @@ RectTransform:
|
|||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 5126270613791086521}
|
- {fileID: 5126270613791086521}
|
||||||
m_Father: {fileID: 5126270615579512174}
|
m_Father: {fileID: 5126270615579512174}
|
||||||
m_RootOrder: 3
|
m_RootOrder: 4
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.15279594, y: 0.84337944}
|
m_AnchorMin: {x: 0.15279594, y: 0.84337944}
|
||||||
m_AnchorMax: {x: 0.84562683, y: 1}
|
m_AnchorMax: {x: 0.84562683, y: 1}
|
||||||
@ -438,7 +514,7 @@ RectTransform:
|
|||||||
- {fileID: 5126270615079281522}
|
- {fileID: 5126270615079281522}
|
||||||
- {fileID: 5126270613833907889}
|
- {fileID: 5126270613833907889}
|
||||||
m_Father: {fileID: 5126270615579512174}
|
m_Father: {fileID: 5126270615579512174}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0.65500003}
|
m_AnchorMin: {x: 0, y: 0.65500003}
|
||||||
m_AnchorMax: {x: 1, y: 0.73300004}
|
m_AnchorMax: {x: 1, y: 0.73300004}
|
||||||
@ -2834,7 +2910,7 @@ RectTransform:
|
|||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 5126270615579512174}
|
m_Father: {fileID: 5126270615579512174}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 3
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
@ -4250,7 +4326,7 @@ RectTransform:
|
|||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 5126270615579512174}
|
m_Father: {fileID: 5126270615579512174}
|
||||||
m_RootOrder: 4
|
m_RootOrder: 5
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.8095423, y: 0.84337944}
|
m_AnchorMin: {x: 0.8095423, y: 0.84337944}
|
||||||
m_AnchorMax: {x: 0.91118664, y: 0.89958954}
|
m_AnchorMax: {x: 0.91118664, y: 0.89958954}
|
||||||
@ -4556,6 +4632,7 @@ RectTransform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
|
- {fileID: 113360677477337524}
|
||||||
- {fileID: 789618783476594303}
|
- {fileID: 789618783476594303}
|
||||||
- {fileID: 5126270613767237533}
|
- {fileID: 5126270613767237533}
|
||||||
- {fileID: 5126270614769088224}
|
- {fileID: 5126270614769088224}
|
||||||
@ -4860,7 +4937,7 @@ PrefabInstance:
|
|||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3}
|
- target: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3}
|
||||||
propertyPath: m_RootOrder
|
propertyPath: m_RootOrder
|
||||||
value: 5
|
value: 6
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: dac544bca4358514d949413f04b4421c, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: dac544bca4358514d949413f04b4421c, type: 3}
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -1937,6 +1937,14 @@ PrefabInstance:
|
|||||||
propertyPath: m_LocalEulerAnglesHint.z
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5044707777241721125, guid: dac544bca4358514d949413f04b4421c, type: 3}
|
||||||
|
propertyPath: retbutton
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 4534604694238587279}
|
||||||
|
- target: {fileID: 5044707777241721125, guid: dac544bca4358514d949413f04b4421c, type: 3}
|
||||||
|
propertyPath: ClosureObj
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 499058875926005686}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: dac544bca4358514d949413f04b4421c, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: dac544bca4358514d949413f04b4421c, type: 3}
|
||||||
--- !u!224 &4534604694238587276 stripped
|
--- !u!224 &4534604694238587276 stripped
|
||||||
@ -1944,3 +1952,14 @@ RectTransform:
|
|||||||
m_CorrespondingSourceObject: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3}
|
m_CorrespondingSourceObject: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3}
|
||||||
m_PrefabInstance: {fileID: 9007993491615309697}
|
m_PrefabInstance: {fileID: 9007993491615309697}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!114 &4534604694238587279 stripped
|
||||||
|
MonoBehaviour:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 4894555910357792270, guid: dac544bca4358514d949413f04b4421c, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 9007993491615309697}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
Loading…
Reference in New Issue
Block a user