Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Art/UIAssets/decorate/dec_fuzhu2.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: CX8btSypVS3IM6qqVp63v9+JRDxF1VvbfReW8kQ5jDRFPm79kJ/1kAG0+adV
+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/Res/UI/MainHeroPanel/SelectFaBaoPanel.prefab

@@ -842,7 +842,7 @@ RectTransform:
   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: -263.7, y: 355.53}
+  m_AnchoredPosition: {x: -263.7, y: 340.7781}
   m_SizeDelta: {x: 164.0966, y: 204.2354}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4755960994092275630
@@ -1257,7 +1257,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 271.7, y: 54.325}
+  m_AnchoredPosition: {x: 271.7, y: 37.824966}
   m_SizeDelta: {x: 0, y: 75.668}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &7359437752171597100
@@ -2853,7 +2853,7 @@ RectTransform:
   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.3921, y: 359.75186}
+  m_AnchoredPosition: {x: 1.3921, y: 345}
   m_SizeDelta: {x: 711.1741, y: 212.6871}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8870171658625692314
@@ -2942,7 +2942,7 @@ RectTransform:
   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: 68.02026, y: -1.1071}
+  m_AnchoredPosition: {x: 68.02026, y: -17.607136}
   m_SizeDelta: {x: 475.6842, y: 1.8143}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2707776363039189316
@@ -2966,7 +2966,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.95294124, g: 0.8980393, b: 0.6627451, a: 1}
+  m_Color: {r: 0.2405659, g: 0.15144826, b: 0.039716035, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -4113,7 +4113,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -466.3, y: 52.5}
+  m_AnchoredPosition: {x: -466.3, y: 36}
   m_SizeDelta: {x: 61.038, y: 61.9771}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &7965205304804970307
@@ -5197,7 +5197,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 209.3, y: -50.3}
+  m_AnchoredPosition: {x: 209.3, y: -66.80003}
   m_SizeDelta: {x: 0, y: 75.668}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &7271376927170581440

Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab

@@ -637,11 +637,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 5142448662693722814}
+  m_Father: {fileID: 1062516556747891371}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 366, y: 269}
   m_SizeDelta: {x: 62, y: 62}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &8716127586724495292
@@ -864,12 +864,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 1062516556747891371}
+  m_Father: {fileID: 5142448662693722814}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -9, y: -8}
-  m_SizeDelta: {x: 0, y: 71.377686}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 287, y: 0.5536423}
+  m_SizeDelta: {x: 72, y: 71.377686}
   m_Pivot: {x: 1, y: 1}
 --- !u!222 &661607412772170253
 CanvasRenderer:
@@ -892,7 +892,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.59607846, g: 0.3647059, b: 0.90196085, a: 1}
+  m_Color: {r: 0.69145536, g: 0.075671814, b: 0.8443395, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -901,10 +901,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 37
+    m_FontSize: 36
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 5
+    m_MinSize: 3
     m_MaxSize: 76
     m_Alignment: 8
     m_AlignByGeometry: 0
@@ -957,33 +957,33 @@ MonoBehaviour:
     - Target: {fileID: 2679299554753557332}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.59607846, y: 0.3647059, z: 0.90196085, w: 1}
+      - {x: 0.7921569, y: 0.22352941, z: 0.93333334, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 4731082921620160257}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.59607846, y: 0.3647059, z: 0.9019608, w: 1}
+      - {x: 0.79116344, y: 0.22467943, z: 0.9339621, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
   - StateInfos:
     - Target: {fileID: 2679299554753557332}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.8431373, y: 0.45882356, z: 0.32156864, w: 1}
+      - {x: 0.9150942, y: 0.3516983, z: 0.112228416, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 4731082921620160257}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.84313726, y: 0.45882353, z: 0.32156864, w: 1}
+      - {x: 0.9137255, y: 0.3529412, z: 0.11372549, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
   AllComs:
   - {fileID: 2679299554753557332}
   - {fileID: 4731082921620160257}
   AllComsStateTypes: 8000000080000000
-  CurrIndex: 1
+  CurrIndex: 2
 --- !u!1 &2841900498943777658
 GameObject:
   m_ObjectHideFlags: 0
@@ -1944,7 +1944,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.59607846, g: 0.3647059, b: 0.9019608, a: 1}
+  m_Color: {r: 0.6901961, g: 0.07450981, b: 0.84313726, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2810,7 +2810,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8235294, g: 0.23137255, b: 0.8980392, a: 1}
+  m_Color: {r: 0.7547367, g: 0.39302227, b: 0.8679244, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -3337,7 +3337,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8468219431132250151}
-  - {fileID: 868834413672771607}
+  - {fileID: 1737448580674146482}
   m_Father: {fileID: 1062516556747891371}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
@@ -3371,7 +3371,7 @@ MonoBehaviour:
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 4
-  m_Spacing: 10.4
+  m_Spacing: 11
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
@@ -3743,7 +3743,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8233183, g: 0.2325116, b: 0.8962264, a: 1}
+  m_Color: {r: 0.7529412, g: 0.39215687, b: 0.8666667, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -3987,10 +3987,10 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 1737448580674146482}
   - {fileID: 5142448662693722814}
   - {fileID: 7374263567999719867}
   - {fileID: 7957023652684022640}
+  - {fileID: 868834413672771607}
   m_Father: {fileID: 6694772361877173011}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
@@ -4066,13 +4066,13 @@ MonoBehaviour:
     - Target: {fileID: 7313999456231797816}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.89019614, y: 0.78823537, z: 0.41176474, w: 1}
+      - {x: 1, y: 0.86388886, z: 0.38207537, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 5830136030932177828}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.89019614, y: 0.78823537, z: 0.41176474, w: 1}
+      - {x: 0.9811319, y: 0.8078755, z: 0.19900306, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
   - StateInfos:
@@ -4131,13 +4131,13 @@ MonoBehaviour:
     - Target: {fileID: 7313999456231797816}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.8233183, y: 0.2325116, z: 0.8962264, w: 1}
+      - {x: 0.7529412, y: 0.39215687, z: 0.8666667, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 5830136030932177828}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.8235294, y: 0.23137255, z: 0.8980392, w: 1}
+      - {x: 0.7547367, y: 0.39302227, z: 0.8679244, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
   AllComs:

Assets/Res/UI/SkillSelectPanel/SkillWidget.prefab

@@ -996,7 +996,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8235294, g: 0.23137255, b: 0.8980392, a: 1}
+  m_Color: {r: 0.976415, g: 0.954368, b: 0.32700682, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

Assets/Res/UIAtlas/tongyong.spriteatlasv2

@@ -50,6 +50,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 0ca05684ec26a624a9be95c43eaa0897, type: 3}
     - {fileID: 2800000, guid: 7a4d82b8d51add842a86c03efe809031, type: 3}
     - {fileID: 2800000, guid: 17b5819cad711404c975f429ddaacb35, type: 3}
+    - {fileID: 2800000, guid: 6540646f497b7f7448aff9a1910e3817, type: 3}
     - {fileID: 2800000, guid: 7d62cfa675b75a24cb95907fd2de10ca, type: 3}
     - {fileID: 2800000, guid: 471869ab4e95d7148ae33f596ff58701, type: 3}
     - {fileID: 2800000, guid: 6c45afd6bc7e1db429d58030b64f1609, type: 3}