李桃 1 天之前
父節點
當前提交
f7a5341c44

二進制
Assets/Art/UIAssets/bg/bg_lh_quelinger.png


二進制
Assets/Art/UIAssets/bg/bg_lh_queyinger.png


+ 0 - 133
Assets/Art/UIAssets/bg/bg_lh_queyinger.png.meta

@@ -1,133 +0,0 @@
-fileFormatVersion: 2
-guid: Wn4fsyyuVHvjMJdDFfaK75TZygeCXiYsoi7CeXMN09Q7E64BCK8CiNvYQ9fc
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 13
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  webStreaming: 0
-  priorityLevel: 0
-  uploadedMode: 2
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

二進制
Assets/Art/UIAssets/decorate/dec_gongfa_di1.png


二進制
Assets/Art/UIAssets/decorate/dec_gongfa_di2.png


文件差異過大導致無法顯示
+ 1102 - 0
Assets/Art/cs3.scene


+ 144 - 37
Assets/Res/UI/SkillSelectPanel/SkillWidget.prefab

@@ -11,6 +11,7 @@ GameObject:
   - component: {fileID: 8005189183441926883}
   - component: {fileID: 4973722897884048289}
   - component: {fileID: 4513486182597197423}
+  - component: {fileID: 538007713068669797}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_Level
@@ -31,12 +32,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 7578534503293312128}
+  m_Father: {fileID: 1399982916654462740}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -0.4000244, y: -27.6}
-  m_SizeDelta: {x: -46.99, y: -210}
+  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: 82.655, y: 26.560001}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4973722897884048289
 CanvasRenderer:
@@ -59,7 +60,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.2627451, g: 0.2627451, b: 0.2627451, a: 1}
+  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
@@ -68,8 +69,8 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 20
-    m_FontStyle: 1
+    m_FontSize: 24
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
@@ -80,6 +81,22 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "1\u7EA7"
+--- !u!114 &538007713068669797
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 494216372642911261}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  effectColor: {r: 0.3207546, g: 0.139396, b: 0.08472758, a: 1}
+  effectDistanceX: 1
+  effectDistanceY: 1
+  samplingRate: 10
 --- !u!1 &740275112248685339
 GameObject:
   m_ObjectHideFlags: 0
@@ -267,41 +284,41 @@ MonoBehaviour:
     - Target: {fileID: 4044849639734904529}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.7058824, y: 0.43921572, z: 0.0627451, w: 1}
+      - {x: 1, y: 0.92102784, z: 0.22641498, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
   - StateInfos:
     - Target: {fileID: 4044849639734904529}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.13333334, y: 0.5176471, z: 0.18823531, w: 1}
+      - {x: 0.36078432, y: 0.81568635, z: 0.43529415, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
   - StateInfos:
     - Target: {fileID: 4044849639734904529}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.10588236, y: 0.3921569, z: 0.5568628, w: 1}
+      - {x: 0.34883392, y: 0.8060159, z: 0.9481131, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
   - StateInfos:
     - Target: {fileID: 4044849639734904529}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.49411768, y: 0.0627451, z: 0.078431375, w: 1}
+      - {x: 0.966981, y: 0.27823496, z: 0.28814897, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
   - StateInfos:
     - Target: {fileID: 4044849639734904529}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.35686275, y: 0.21176472, z: 0.04705883, w: 1}
+      - {x: 0.6745281, y: 0.6083005, z: 0.47089696, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
   AllComs:
   - {fileID: 4044849639734904529}
   AllComsStateTypes: 40000000
-  CurrIndex: 3
+  CurrIndex: 0
 --- !u!1 &1269921678863901166
 GameObject:
   m_ObjectHideFlags: 0
@@ -315,7 +332,7 @@ GameObject:
   - component: {fileID: 557736380432009434}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: myImage zhudong
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -378,7 +395,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_gongfa_di2
+  _icon_name: dec_gongfa_di1
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
   packInfo:
@@ -427,7 +444,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -0.0000044107437, y: 0}
-  m_SizeDelta: {x: 117.0039, y: 24.401989}
+  m_SizeDelta: {x: 107.2, y: 31}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9004169807973307310
 CanvasRenderer:
@@ -459,10 +476,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 21
-    m_FontStyle: 1
+    m_FontSize: 28
+    m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 2
     m_MaxSize: 40
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -501,7 +518,7 @@ RectTransform:
   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_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 7305513881155388835}
   - {fileID: 295106506078024080}
@@ -512,7 +529,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 56.4}
+  m_AnchoredPosition: {x: 0, y: 52.8}
   m_SizeDelta: {x: 0, y: 30.610802}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &39893200661916418
@@ -598,7 +615,7 @@ RectTransform:
   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: -3.7000275}
+  m_AnchoredPosition: {x: 0, y: -2}
   m_SizeDelta: {x: 16, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8199172619172445228
@@ -622,7 +639,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9568628, g: 0.9294118, b: 0.8313726, a: 1}
+  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
@@ -631,8 +648,8 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 22
-    m_FontStyle: 1
+    m_FontSize: 30
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
@@ -732,6 +749,96 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &3186028684346749270
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1399982916654462740}
+  - component: {fileID: 184391794983304602}
+  - component: {fileID: 3567577251628101864}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: dengjizi db
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1399982916654462740
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3186028684346749270}
+  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:
+  - {fileID: 8005189183441926883}
+  m_Father: {fileID: 7578534503293312128}
+  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.6, y: -20.7}
+  m_SizeDelta: {x: 74.2, y: 26}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &184391794983304602
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3186028684346749270}
+  m_CullTransparentMesh: 1
+--- !u!114 &3567577251628101864
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3186028684346749270}
+  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: 0.6313726, g: 0.82745105, b: 0.8117648, 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: 1
+  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: dec_juxing_yuanjiao16
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 214e2ce8f42cdb8b334a7be5c3d3bfa0
+  imageH: 26
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &3266992687204387941
 GameObject:
   m_ObjectHideFlags: 0
@@ -769,7 +876,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -1.5, y: 99.3}
-  m_SizeDelta: {x: 76.258, y: 26}
+  m_SizeDelta: {x: 108.1, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &438287497116520212
 CanvasRenderer:
@@ -792,7 +899,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.7725491, g: 0.6627451, b: 0.43137258, a: 1}
+  m_Color: {r: 0.45098042, g: 0.6, b: 0.5647059, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -809,14 +916,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_xiulianTiaoDi
+  _icon_name: dec_juxing_yuanjiao16
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: jingjie
-    packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
-    packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
-    lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 214e2ce8f42cdb8b334a7be5c3d3bfa0
   imageH: 26
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
@@ -882,7 +989,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.49411768, g: 0.0627451, b: 0.078431375, a: 1}
+  m_Color: {r: 0.94509804, g: 0.61960787, b: 0.07450981, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1036,7 +1143,7 @@ RectTransform:
   - {fileID: 7896131592767513033}
   - {fileID: 1608102705727293640}
   - {fileID: 142305117687377865}
-  - {fileID: 8005189183441926883}
+  - {fileID: 1399982916654462740}
   - {fileID: 4933297852123740916}
   - {fileID: 7716599432344587041}
   - {fileID: 5173371119107913860}
@@ -1098,7 +1205,7 @@ MonoBehaviour:
   - {fileID: 1269921678863901166}
   - {fileID: 3266992687204387941}
   AllComsStateTypes: 0002000040000000
-  CurrIndex: 0
+  CurrIndex: 1
 --- !u!1 &5661546328325043756
 GameObject:
   m_ObjectHideFlags: 0

二進制
美术/art_use_ui/gongfa/dec_gongfa_di1.png


二進制
美术/art_use_ui/gongfa/dec_gongfa_di2.png


二進制
美术/unity_use_ui/decorate/dec_gongfa_di1.png


二進制
美术/unity_use_ui/decorate/dec_gongfa_di2.png


部分文件因文件數量過多而無法顯示