Skip to content

Commit

Permalink
deer_gf之图片
Browse files Browse the repository at this point in the history
  • Loading branch information
@It-Life
It-Life committed Nov 1, 2022
1 parent 546cb77 commit 4eee9bf
Show file tree
Hide file tree
Showing 6 changed files with 203 additions and 44 deletions.
191 changes: 170 additions & 21 deletions Assets/Deer/AssetsHotfix/UI/UIForms/UILogin/UILoginForm.prefab
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,154 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &391062314768755873
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5041278735936476476}
- component: {fileID: 185500824502062227}
- component: {fileID: 3007466908418804614}
m_Layer: 0
m_Name: Img_Icon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5041278735936476476
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 391062314768755873}
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: 1495174404976755347}
m_RootOrder: 4
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: 0, y: 27}
m_SizeDelta: {x: 599.664, y: 252.983}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &185500824502062227
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 391062314768755873}
m_CullTransparentMesh: 1
--- !u!114 &3007466908418804614
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 391062314768755873}
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: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 0
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 &4719882277998262211
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6478027724785754277}
- component: {fileID: 441674738861497021}
- component: {fileID: 5840754655828044901}
m_Layer: 0
m_Name: RImg_NetImage
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6478027724785754277
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4719882277998262211}
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: 1495174404976755347}
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: 0, y: 361}
m_SizeDelta: {x: 540, y: 258}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &441674738861497021
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4719882277998262211}
m_CullTransparentMesh: 1
--- !u!114 &5840754655828044901
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4719882277998262211}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Texture: {fileID: 0}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!1 &8717174404173453346
GameObject:
m_ObjectHideFlags: 0
Expand All @@ -12,7 +161,7 @@ GameObject:
- component: {fileID: 3890197745366220649}
- component: {fileID: 6095947558138359748}
m_Layer: 0
m_Name: bg
m_Name: RImg_bg
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -478,36 +627,36 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3}
propertyPath: BindDatas.Array.size
value: 3
value: 6
objectReference: {fileID: 0}
- target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3}
propertyPath: m_BindComs.Array.size
value: 3
value: 6
objectReference: {fileID: 0}
- target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3}
propertyPath: m_BindComs.Array.data[0]
value:
objectReference: {fileID: 623993447138566447}
objectReference: {fileID: 6095947558138359748}
- target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3}
propertyPath: m_BindComs.Array.data[1]
value:
objectReference: {fileID: 296981030997182132}
objectReference: {fileID: 623993447138566447}
- target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3}
propertyPath: m_BindComs.Array.data[2]
value:
objectReference: {fileID: 7770801486675531758}
objectReference: {fileID: 296981030997182132}
- target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3}
propertyPath: m_BindComs.Array.data[3]
value:
objectReference: {fileID: 0}
objectReference: {fileID: 7770801486675531758}
- target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3}
propertyPath: m_BindComs.Array.data[4]
value:
objectReference: {fileID: 0}
objectReference: {fileID: 3007466908418804614}
- target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3}
propertyPath: m_BindComs.Array.data[5]
value:
objectReference: {fileID: 0}
objectReference: {fileID: 5840754655828044901}
- target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3}
propertyPath: m_BindComs.Array.data[6]
value:
Expand All @@ -518,27 +667,27 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3}
propertyPath: BindDatas.Array.data[0].Name
value: Btn_Login
value: RImg_bg
objectReference: {fileID: 0}
- target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3}
propertyPath: BindDatas.Array.data[1].Name
value: Btn_Login1
value: Btn_Login
objectReference: {fileID: 0}
- target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3}
propertyPath: BindDatas.Array.data[2].Name
value: Btn_UIButtonTest
value: Btn_Login1
objectReference: {fileID: 0}
- target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3}
propertyPath: BindDatas.Array.data[3].Name
value: TxtM_aaa
value: Btn_UIButtonTest
objectReference: {fileID: 0}
- target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3}
propertyPath: BindDatas.Array.data[4].Name
value: TxtM_bbb
value: Img_Icon
objectReference: {fileID: 0}
- target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3}
propertyPath: BindDatas.Array.data[5].Name
value: Btn_UIButtonTest11
value: RImg_NetImage
objectReference: {fileID: 0}
- target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3}
propertyPath: BindDatas.Array.data[6].Name
Expand All @@ -551,27 +700,27 @@ PrefabInstance:
- target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3}
propertyPath: BindDatas.Array.data[0].BindCom
value:
objectReference: {fileID: 623993447138566447}
objectReference: {fileID: 6095947558138359748}
- target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3}
propertyPath: BindDatas.Array.data[1].BindCom
value:
objectReference: {fileID: 296981030997182132}
objectReference: {fileID: 623993447138566447}
- target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3}
propertyPath: BindDatas.Array.data[2].BindCom
value:
objectReference: {fileID: 7770801486675531758}
objectReference: {fileID: 296981030997182132}
- target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3}
propertyPath: BindDatas.Array.data[3].BindCom
value:
objectReference: {fileID: 0}
objectReference: {fileID: 7770801486675531758}
- target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3}
propertyPath: BindDatas.Array.data[4].BindCom
value:
objectReference: {fileID: 0}
objectReference: {fileID: 3007466908418804614}
- target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3}
propertyPath: BindDatas.Array.data[5].BindCom
value:
objectReference: {fileID: 0}
objectReference: {fileID: 5840754655828044901}
- target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3}
propertyPath: BindDatas.Array.data[6].BindCom
value:
Expand Down
15 changes: 11 additions & 4 deletions Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/BindComponents/UILoginForm.BindComponents.cs
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,28 @@
using UnityEngine;
using UnityEngine.UI;
using UnityEngine;
using UnityEngine.UI;

namespace HotfixBusiness.UI
{
public partial class UILoginForm
{
private RawImage m_RImg_bg;
private UIButtonSuper m_Btn_Login;
private UIButtonSuper m_Btn_Login1;
private UIButtonSuper m_Btn_UIButtonTest;
private Image m_Img_Icon;
private RawImage m_RImg_NetImage;

private void GetBindComponents(GameObject go)
{
ComponentAutoBindTool autoBindTool = go.GetComponent<ComponentAutoBindTool>();

m_Btn_Login = autoBindTool.GetBindComponent<UIButtonSuper>(0);
m_Btn_Login1 = autoBindTool.GetBindComponent<UIButtonSuper>(1);
m_Btn_UIButtonTest = autoBindTool.GetBindComponent<UIButtonSuper>(2);
m_RImg_bg = autoBindTool.GetBindComponent<RawImage>(0);
m_Btn_Login = autoBindTool.GetBindComponent<UIButtonSuper>(1);
m_Btn_Login1 = autoBindTool.GetBindComponent<UIButtonSuper>(2);
m_Btn_UIButtonTest = autoBindTool.GetBindComponent<UIButtonSuper>(3);
m_Img_Icon = autoBindTool.GetBindComponent<Image>(4);
m_RImg_NetImage = autoBindTool.GetBindComponent<RawImage>(5);
}
}
}
3 changes: 3 additions & 0 deletions Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/UILogin/UILoginForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ protected override void OnInit(object userData) {
m_Btn_Login1.onClick.AddListener(Btn_Login1Event);
m_Btn_UIButtonTest.onClick.AddListener(Btn_UIButtonTestEvent);
/*--------------------Auto generate end button listener.Do not modify!----------------------*/
m_RImg_bg.SetTexture(AssetUtility.UI.GetTexturePath("loading_bg"));
m_Img_Icon.SetSprite(AssetUtility.UI.GetSpriteCollectionPath("Icon"),AssetUtility.UI.GetSpritePath("Icon/Icon"));
m_RImg_NetImage.SetTextureByNetwork("https://www.baidu.com/img/PCtm_d9c8750bed0b3c7d089fa7d55720d6cf.png");
}

private void Btn_LoginEvent()
Expand Down
4 changes: 2 additions & 2 deletions ...eer/Scripts/Hotfix/HotfixFramework/Runtime/Component/TextureExtension/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
`m_CheckCanReleaseInterval`和`m_AutoReleaseInterval` 配合使用 检查到可回收对象会调用对象池 回收。 对象池到达释放时间会自动清理。
## Texture 的加载 与卸载

加载Texture 通过 `TextureSetComponent` 的`SetTextureByFileSystem` `SetTextureByNetwork` `SetTextureByResources`方法
加载Texture 通过 `TextureSetComponent` 的`SetTextureByFileSystem` `SetTextureByNetwork` `SetTexture`方法

`SetTexture` 三个方法都需要提供一个 实现了`ISetTexture2dObject` 接口的对象。

Expand All @@ -40,7 +40,7 @@
```csharp
rawImage.SetTextureByFileSystem("TestTexture.png");
rawImage.SetTextureByNetwork("http://xxx/xxx.png","TestTexture.png");//第二个参数是将网络图片保存到文件系统中的地址。可以不填写。
rawImage.SetTextureByResources("Assets/Res/TestTexture.png");
rawImage.SetTexture("Assets/Res/TestTexture.png");
```

卸载Texture由扩展组件卸载。不需要用户手动控制。
2 changes: 1 addition & 1 deletion ...Scripts/Hotfix/HotfixFramework/Runtime/Component/TextureExtension/SetTextureExtensions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public static void SetTextureByNetwork(this RawImage rawImage, string file, stri
{
GameEntry.TextureSet.SetTextureByNetwork(SetRawImage.Create(rawImage, file), saveFilePath);
}
public static void SetTextureByResources(this RawImage rawImage, string file)
public static void SetTexture(this RawImage rawImage, string file)
{
GameEntry.TextureSet.SetTextureByResources(SetRawImage.Create(rawImage, file));
}
Expand Down
Loading

0 comments on commit 4eee9bf

Please sign in to comment.