李桃 vor 5 Monaten
Ursprung
Commit
aaa1063f36

BIN
Assets/Art/UIAssets/icon/icon_tx105.png


BIN
Assets/Art/UIAssets/icon/icon_tx107.png


BIN
Assets/Art/UIAssets/icon/icon_tx113.png


BIN
Assets/Art/UIAssets/icon/icon_tx116.png


+ 86 - 86
Assets/Res/UI/WidgetHero.prefab

@@ -1393,7 +1393,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2063415315462851415}
-  - {fileID: 7602731387458885778}
   - {fileID: 8309734339275653843}
   - {fileID: 3495421123750844930}
   - {fileID: 469899750509314430}
@@ -1426,7 +1425,7 @@ MonoBehaviour:
     isList: 0
     ListCollectorDatas: []
   - key: iconHero
-    gameObject: {fileID: 2063880575880762248}
+    gameObject: {fileID: 0}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
@@ -2139,90 +2138,6 @@ RectTransform:
   m_AnchoredPosition: {x: 22.7, y: -7.6}
   m_SizeDelta: {x: 320, y: 62.83}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &6690880340389431512
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 7602731387458885778}
-  - component: {fileID: 8224281712761051760}
-  - component: {fileID: 2063880575880762248}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Icon
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &7602731387458885778
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6690880340389431512}
-  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: 1
-  m_Children: []
-  m_Father: {fileID: 5106666997551906113}
-  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: -1.8, y: 13.3}
-  m_SizeDelta: {x: 200, y: 200}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8224281712761051760
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6690880340389431512}
-  m_CullTransparentMesh: 1
---- !u!114 &2063880575880762248
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6690880340389431512}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, 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
-  _icon_name: icon_tx105
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 1a259ebae9e024f1d8fb10d831b49c24, type: 3}
-  packInfo:
-    packName: heroIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson/heroIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/heroIcon.spriteatlasv2
-    lasetJsonGUID: a59a676e2ab5c4925ab687adc8940d7b
 --- !u!1 &7524693852372550712
 GameObject:
   m_ObjectHideFlags: 0
@@ -2343,6 +2258,7 @@ RectTransform:
   - {fileID: 523596360410480434}
   - {fileID: 7979149984353945407}
   - {fileID: 5209605667788404247}
+  - {fileID: 8054779166904259210}
   m_Father: {fileID: 5106666997551906113}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -2401,6 +2317,90 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ShowMaskGraphic: 1
+--- !u!1 &7714437691401065265
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8054779166904259210}
+  - component: {fileID: 8725611398346382494}
+  - component: {fileID: 863526937779437851}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: heroIcon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8054779166904259210
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7714437691401065265}
+  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: 1
+  m_Children: []
+  m_Father: {fileID: 2063415315462851415}
+  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: 0}
+  m_SizeDelta: {x: 150, y: 200}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8725611398346382494
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7714437691401065265}
+  m_CullTransparentMesh: 1
+--- !u!114 &863526937779437851
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7714437691401065265}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, 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
+  _icon_name: icon_tx105
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 1a259ebae9e024f1d8fb10d831b49c24, type: 3}
+  packInfo:
+    packName: heroIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/heroIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/heroIcon.spriteatlasv2
+    lasetJsonGUID: a54d3984b6522f413325daf005732f7d
 --- !u!1 &7991572580298050915
 GameObject:
   m_ObjectHideFlags: 0

+ 0 - 4
Assets/Res/UIAtlas/heroIcon.spriteatlasv2

@@ -11,13 +11,9 @@ SpriteAtlasAsset:
   m_MasterAtlas: {fileID: 0}
   m_ImporterData:
     packables:
-    - {fileID: 2800000, guid: b65e2e02a81385d4a9f5efd3ced646c7, type: 3}
     - {fileID: 2800000, guid: ff7f553a76e6f4322a64fbb61d20f9ba, type: 3}
     - {fileID: 2800000, guid: 40bc652a2f80c4500b10133dd8ca5e43, type: 3}
     - {fileID: 2800000, guid: 3077f31e475de4831b14989f053d238f, type: 3}
     - {fileID: 2800000, guid: 686bc6c27b77549b0a4309b808e6620b, type: 3}
-    - {fileID: 2800000, guid: 766a9ded43a777e40a692f1011ad3905, type: 3}
-    - {fileID: 2800000, guid: 4a3284a2831e4644384a542c55f957d6, type: 3}
-    - {fileID: 2800000, guid: 03103a6e9455927489072baa4d3ba84a, type: 3}
   m_IsVariant: 0
   m_IsPlaceholder: 0

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


BIN
美术/art_use_ui/heroIcon/icon_tx1.png


BIN
美术/art_use_ui/heroIcon/icon_tx105.png


BIN
美术/art_use_ui/heroIcon/icon_tx107.png


BIN
美术/art_use_ui/heroIcon/icon_tx113.png


BIN
美术/art_use_ui/heroIcon/icon_tx116.png


BIN
美术/art_use_ui/heroIcon/icon_tx2.png


BIN
美术/art_use_ui/heroIcon/icon_tx3.png


BIN
美术/art_use_ui/heroIcon/icon_tx4.png


BIN
美术/unity_use_ui/icon/icon_tx105.png


BIN
美术/unity_use_ui/icon/icon_tx107.png


BIN
美术/unity_use_ui/icon/icon_tx113.png


BIN
美术/unity_use_ui/icon/icon_tx116.png


Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.