浏览代码

修改心境ui

lzx 8 小时之前
父节点
当前提交
8fe7613d10

文件差异内容过多而无法显示
+ 0 - 0
Assets/Art/UIAssets/TextrueJson/tongyong.txt


二进制
Assets/Art/UIAssets/decorate/dec_xinjing_zi.png


+ 203 - 0
Assets/Art/UIAssets/decorate/dec_xinjing_zi.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: DS4d4CP/VHvokZp7J1Id/ue9VJB/mIuYz4Xa1cAED8iVzFMbQu6s8+HKNgkS
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    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: Android
+    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: WeixinMiniGame
+    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: HMIAndroid
+    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: OpenHarmony
+    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: 

文件差异内容过多而无法显示
+ 112 - 112
Assets/Res/Config/HeroPowerUpConfig.json


+ 14 - 7
Assets/Res/Config/SentimentConfig.json

@@ -3,7 +3,8 @@
     {
       "ID": 1,
       "name": 3078,
-      "icon": "",
+      "icon": "icon_xinjing1",
+      "icon_Text": "icon_xinjing1",
       "mainSentimentEffect": 1,
       "sentimentEffect": [
         111,
@@ -17,7 +18,8 @@
     {
       "ID": 2,
       "name": 3079,
-      "icon": "",
+      "icon": "icon_xinjing2",
+      "icon_Text": "icon_xinjing2",
       "mainSentimentEffect": 2,
       "sentimentEffect": [
         121,
@@ -31,7 +33,8 @@
     {
       "ID": 3,
       "name": 3080,
-      "icon": "",
+      "icon": "icon_xinjing3",
+      "icon_Text": "icon_xinjing3",
       "mainSentimentEffect": 3,
       "sentimentEffect": [
         131,
@@ -45,7 +48,8 @@
     {
       "ID": 4,
       "name": 3081,
-      "icon": "",
+      "icon": "icon_xinjing4",
+      "icon_Text": "icon_xinjing4",
       "mainSentimentEffect": 4,
       "sentimentEffect": [
         141,
@@ -59,7 +63,8 @@
     {
       "ID": 5,
       "name": 3082,
-      "icon": "",
+      "icon": "icon_xinjing5",
+      "icon_Text": "icon_xinjing5",
       "mainSentimentEffect": 5,
       "sentimentEffect": [
         151,
@@ -73,7 +78,8 @@
     {
       "ID": 6,
       "name": 3083,
-      "icon": "",
+      "icon": "icon_xinjing6",
+      "icon_Text": "icon_xinjing6",
       "mainSentimentEffect": 6,
       "sentimentEffect": [
         161,
@@ -87,7 +93,8 @@
     {
       "ID": 7,
       "name": 3084,
-      "icon": "",
+      "icon": "icon_xinjing7",
+      "icon_Text": "icon_xinjing7",
       "mainSentimentEffect": 7,
       "sentimentEffect": [
         171,

+ 35 - 35
Assets/Res/Config/SentimentEffectConfig.json

@@ -14,7 +14,7 @@
       "effectVale": [
         60101
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -31,7 +31,7 @@
       "effectVale": [
         60101
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -48,7 +48,7 @@
       "effectVale": [
         60101
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -65,7 +65,7 @@
       "effectVale": [
         60101
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -82,7 +82,7 @@
       "effectVale": [
         60101
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -99,7 +99,7 @@
       "effectVale": [
         60102
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -116,7 +116,7 @@
       "effectVale": [
         60102
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -133,7 +133,7 @@
       "effectVale": [
         60102
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -150,7 +150,7 @@
       "effectVale": [
         60102
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -167,7 +167,7 @@
       "effectVale": [
         60102
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -184,7 +184,7 @@
       "effectVale": [
         60103
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -201,7 +201,7 @@
       "effectVale": [
         60103
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -218,7 +218,7 @@
       "effectVale": [
         60103
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -235,7 +235,7 @@
       "effectVale": [
         60103
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -252,7 +252,7 @@
       "effectVale": [
         60103
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -269,7 +269,7 @@
       "effectVale": [
         60104
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -286,7 +286,7 @@
       "effectVale": [
         60104
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -303,7 +303,7 @@
       "effectVale": [
         60104
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -320,7 +320,7 @@
       "effectVale": [
         60104
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -337,7 +337,7 @@
       "effectVale": [
         60104
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -354,7 +354,7 @@
       "effectVale": [
         60105
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -371,7 +371,7 @@
       "effectVale": [
         60105
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -388,7 +388,7 @@
       "effectVale": [
         60105
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -405,7 +405,7 @@
       "effectVale": [
         60105
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -422,7 +422,7 @@
       "effectVale": [
         60105
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -439,7 +439,7 @@
       "effectVale": [
         60106
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -456,7 +456,7 @@
       "effectVale": [
         60106
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -473,7 +473,7 @@
       "effectVale": [
         60106
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -490,7 +490,7 @@
       "effectVale": [
         60106
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -507,7 +507,7 @@
       "effectVale": [
         60106
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -524,7 +524,7 @@
       "effectVale": [
         60107
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -541,7 +541,7 @@
       "effectVale": [
         60107
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -558,7 +558,7 @@
       "effectVale": [
         60107
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -575,7 +575,7 @@
       "effectVale": [
         60107
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {
@@ -592,7 +592,7 @@
       "effectVale": [
         60107
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 1001,
       "upConstCount": 1
     },
     {

+ 46 - 46
Assets/Res/Config/SkillConfig.json

@@ -10178,7 +10178,7 @@
       "level": 1,
       "effectValue": [
         3.0,
-        80.0
+        120.0
       ],
       "intensifierIndex": [
         1
@@ -10202,7 +10202,7 @@
       "level": 2,
       "effectValue": [
         3.0,
-        90.0
+        140.0
       ],
       "intensifierIndex": [
         1
@@ -10225,8 +10225,8 @@
       "SkillType": 1,
       "level": 3,
       "effectValue": [
-        4.0,
-        100.0
+        3.0,
+        160.0
       ],
       "intensifierIndex": [
         1
@@ -10249,8 +10249,8 @@
       "SkillType": 1,
       "level": 4,
       "effectValue": [
-        4.0,
-        110.0
+        3.0,
+        180.0
       ],
       "intensifierIndex": [
         1
@@ -10273,8 +10273,8 @@
       "SkillType": 1,
       "level": 5,
       "effectValue": [
-        5.0,
-        120.0
+        3.0,
+        200.0
       ],
       "intensifierIndex": [
         1
@@ -10297,8 +10297,8 @@
       "SkillType": 1,
       "level": 6,
       "effectValue": [
-        5.0,
-        130.0
+        3.0,
+        220.0
       ],
       "intensifierIndex": [
         1
@@ -10316,12 +10316,12 @@
       "scriptName": "S9012",
       "IDGroup": 9012,
       "timelineName": "Boss_fenghuang_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "addcd": 1.0,
       "SkillType": 1,
       "level": 1,
       "effectValue": [
-        230.0,
+        600.0,
         20.0
       ],
       "intensifierIndex": [
@@ -10340,12 +10340,12 @@
       "scriptName": "S9012",
       "IDGroup": 9012,
       "timelineName": "Boss_fenghuang_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "addcd": 1.0,
       "SkillType": 1,
       "level": 2,
       "effectValue": [
-        250.0,
+        800.0,
         20.0
       ],
       "intensifierIndex": [
@@ -10364,12 +10364,12 @@
       "scriptName": "S9012",
       "IDGroup": 9012,
       "timelineName": "Boss_fenghuang_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "addcd": 1.0,
       "SkillType": 1,
       "level": 3,
       "effectValue": [
-        270.0,
+        1000.0,
         20.0
       ],
       "intensifierIndex": [
@@ -10388,12 +10388,12 @@
       "scriptName": "S9012",
       "IDGroup": 9012,
       "timelineName": "Boss_fenghuang_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "addcd": 1.0,
       "SkillType": 1,
       "level": 4,
       "effectValue": [
-        290.0,
+        1200.0,
         20.0
       ],
       "intensifierIndex": [
@@ -10412,12 +10412,12 @@
       "scriptName": "S9012",
       "IDGroup": 9012,
       "timelineName": "Boss_fenghuang_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "addcd": 1.0,
       "SkillType": 1,
       "level": 5,
       "effectValue": [
-        310.0,
+        1400.0,
         20.0
       ],
       "intensifierIndex": [
@@ -10436,12 +10436,12 @@
       "scriptName": "S9012",
       "IDGroup": 9012,
       "timelineName": "Boss_fenghuang_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "addcd": 1.0,
       "SkillType": 1,
       "level": 6,
       "effectValue": [
-        330.0,
+        1600.0,
         20.0
       ],
       "intensifierIndex": [
@@ -10468,7 +10468,7 @@
         10.0,
         10.0,
         5.0,
-        30.0
+        60.0
       ],
       "intensifierIndex": [
         1
@@ -10494,7 +10494,7 @@
         10.0,
         10.0,
         5.0,
-        50.0
+        80.0
       ],
       "intensifierIndex": [
         1
@@ -10520,7 +10520,7 @@
         10.0,
         10.0,
         5.0,
-        70.0
+        100.0
       ],
       "intensifierIndex": [
         1
@@ -10546,7 +10546,7 @@
         10.0,
         10.0,
         5.0,
-        90.0
+        120.0
       ],
       "intensifierIndex": [
         1
@@ -10572,7 +10572,7 @@
         10.0,
         10.0,
         5.0,
-        110.0
+        140.0
       ],
       "intensifierIndex": [
         1
@@ -10598,7 +10598,7 @@
         10.0,
         10.0,
         5.0,
-        130.0
+        160.0
       ],
       "intensifierIndex": [
         1
@@ -10616,13 +10616,13 @@
       "scriptName": "S9014",
       "IDGroup": 9014,
       "timelineName": "Boss_fenghuang_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "addcd": 1.0,
       "SkillType": 1,
       "level": 1,
       "effectValue": [
         3.0,
-        100.0
+        300.0
       ],
       "intensifierIndex": [
         1
@@ -10640,13 +10640,13 @@
       "scriptName": "S9014",
       "IDGroup": 9014,
       "timelineName": "Boss_fenghuang_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "addcd": 1.0,
       "SkillType": 1,
       "level": 2,
       "effectValue": [
         3.0,
-        120.0
+        400.0
       ],
       "intensifierIndex": [
         1
@@ -10664,13 +10664,13 @@
       "scriptName": "S9014",
       "IDGroup": 9014,
       "timelineName": "Boss_fenghuang_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "addcd": 1.0,
       "SkillType": 1,
       "level": 3,
       "effectValue": [
         3.0,
-        140.0
+        500.0
       ],
       "intensifierIndex": [
         1
@@ -10688,13 +10688,13 @@
       "scriptName": "S9014",
       "IDGroup": 9014,
       "timelineName": "Boss_fenghuang_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "addcd": 1.0,
       "SkillType": 1,
       "level": 4,
       "effectValue": [
         3.0,
-        160.0
+        600.0
       ],
       "intensifierIndex": [
         1
@@ -10712,13 +10712,13 @@
       "scriptName": "S9014",
       "IDGroup": 9014,
       "timelineName": "Boss_fenghuang_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "addcd": 1.0,
       "SkillType": 1,
       "level": 5,
       "effectValue": [
         3.0,
-        180.0
+        700.0
       ],
       "intensifierIndex": [
         1
@@ -10736,13 +10736,13 @@
       "scriptName": "S9014",
       "IDGroup": 9014,
       "timelineName": "Boss_fenghuang_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "addcd": 1.0,
       "SkillType": 1,
       "level": 6,
       "effectValue": [
         3.0,
-        200.0
+        800.0
       ],
       "intensifierIndex": [
         1
@@ -11210,7 +11210,7 @@
       "level": 1,
       "effectValue": [
         3.0,
-        200.0
+        120.0
       ],
       "intensifierIndex": [
         1
@@ -11234,7 +11234,7 @@
       "level": 2,
       "effectValue": [
         3.0,
-        220.0
+        150.0
       ],
       "intensifierIndex": [
         1
@@ -11258,7 +11258,7 @@
       "level": 3,
       "effectValue": [
         3.0,
-        240.0
+        180.0
       ],
       "intensifierIndex": [
         1
@@ -11282,7 +11282,7 @@
       "level": 4,
       "effectValue": [
         3.0,
-        260.0
+        210.0
       ],
       "intensifierIndex": [
         1
@@ -11306,7 +11306,7 @@
       "level": 5,
       "effectValue": [
         3.0,
-        280.0
+        240.0
       ],
       "intensifierIndex": [
         1
@@ -11330,7 +11330,7 @@
       "level": 6,
       "effectValue": [
         3.0,
-        300.0
+        270.0
       ],
       "intensifierIndex": [
         1

+ 110 - 19
Assets/Res/UI/SentimentPanel/SentimentEffectWidget.prefab

@@ -1,5 +1,95 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &2046892425832779656
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6870648615626101548}
+  - component: {fileID: 2483347774609607533}
+  - component: {fileID: 5982315701454256144}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6870648615626101548
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2046892425832779656}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.38, y: 0.38, z: 0.38}
+  m_ConstrainProportionsScale: 1
+  m_Children:
+  - {fileID: 128510273463478622}
+  m_Father: {fileID: 3401713860920412346}
+  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.5343, y: -6.6}
+  m_SizeDelta: {x: 240.5039, y: 76}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &2483347774609607533
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2046892425832779656}
+  m_CullTransparentMesh: 1
+--- !u!114 &5982315701454256144
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2046892425832779656}
+  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.13725491, g: 0.121568635, b: 0.08627451, 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_ty_juxing_dahu
+  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: feb6378dcaa66413f6889dff8bec2b3e
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &3391897974650891347
 GameObject:
   m_ObjectHideFlags: 0
@@ -33,10 +123,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 3401713860920412346}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  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: 0, y: 0}
+  m_SizeDelta: {x: 130, y: 131}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &506275492875965220
 CanvasRenderer:
@@ -59,7 +149,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.21568629, g: 0.50980395, b: 0.43137258, 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
@@ -76,7 +166,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_24
+  _icon_name: dec_tianfu_icon1
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -84,6 +174,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 236
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -114,7 +205,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3694727049325856288}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  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
@@ -125,7 +216,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -7, y: 408}
-  m_SizeDelta: {x: 248, y: 236}
+  m_SizeDelta: {x: 130, y: 130}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1857406282712736881
 CanvasRenderer:
@@ -185,17 +276,17 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5573784481617384691}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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_LocalScale: {x: 2.6315792, y: 2.6315792, z: 2.6315792}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3401713860920412346}
+  m_Father: {fileID: 6870648615626101548}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 44.1057}
+  m_AnchoredPosition: {x: -0.088630676, y: 0.00010967255}
+  m_SizeDelta: {x: -30.049107, y: 27.6797}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &3673796543482309853
 CanvasRenderer:
@@ -218,7 +309,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 0.6362447, b: 0, a: 1}
+  m_Color: {r: 0.9803922, g: 0.9333334, b: 0.75294125, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -227,18 +318,18 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 20
+    m_FontSize: 26
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 2
     m_MaxSize: 40
-    m_Alignment: 5
+    m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: lv.1
+  m_Text: 1/5
 --- !u!1 &6543777495714282891
 GameObject:
   m_ObjectHideFlags: 0
@@ -271,7 +362,7 @@ RectTransform:
   m_Children:
   - {fileID: 3793508176197929554}
   - {fileID: 3963609122977541254}
-  - {fileID: 128510273463478622}
+  - {fileID: 6870648615626101548}
   m_Father: {fileID: 7864742459384017618}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -305,7 +396,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3963609122977541254
 RectTransform:
   m_ObjectHideFlags: 0

文件差异内容过多而无法显示
+ 315 - 259
Assets/Res/UI/SentimentPanel/SentimentInfoPanel.prefab


+ 92 - 2
Assets/Res/UI/SentimentPanel/SentimentPanel.prefab

@@ -219,7 +219,7 @@ MonoBehaviour:
     packName: tongyong
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: a0625ec79d61afda18672ed59c9364f7
+    lasetJsonGUID: feb6378dcaa66413f6889dff8bec2b3e
   imageH: 100
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
@@ -345,6 +345,95 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &5380674767276986663
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8433458334176511681}
+  - component: {fileID: 4170656597210444513}
+  - component: {fileID: 4909662600279504468}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8433458334176511681
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5380674767276986663}
+  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: 9037135992368401232}
+  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: -222.1, y: 636.55}
+  m_SizeDelta: {x: 182, y: 82}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4170656597210444513
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5380674767276986663}
+  m_CullTransparentMesh: 1
+--- !u!114 &4909662600279504468
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5380674767276986663}
+  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: dec_xinjing_zi
+  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: a0625ec79d61afda18672ed59c9364f7
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &5692448650326671997
 GameObject:
   m_ObjectHideFlags: 0
@@ -606,7 +695,7 @@ MonoBehaviour:
     packName: tongyong
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: a0625ec79d61afda18672ed59c9364f7
+    lasetJsonGUID: feb6378dcaa66413f6889dff8bec2b3e
   imageH: 100
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
@@ -645,6 +734,7 @@ RectTransform:
   - {fileID: 8245128900902318849}
   - {fileID: 4014844787387584513}
   - {fileID: 554324853660007873}
+  - {fileID: 8433458334176511681}
   - {fileID: 1875949677358207680}
   - {fileID: 3651673096014695874}
   - {fileID: 5288387091934357928}

+ 2 - 2
Assets/Res/UI/SentimentPanel/SentimentXianWidget.prefab

@@ -27,7 +27,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4353551468588870654}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  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
@@ -60,7 +60,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9058824, g: 0.86274517, b: 0.6627451, a: 1}
+  m_Color: {r: 0.8588236, g: 0.7490196, b: 0.4431373, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

+ 1 - 0
Assets/Res/UIAtlas/tongyong.spriteatlasv2

@@ -98,6 +98,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 8ecfbe29019754047916ed69ee538aec, type: 3}
     - {fileID: 2800000, guid: 9bfe4fd79eb566f4ea8a19c63dd1f5ec, type: 3}
     - {fileID: 2800000, guid: 43ee7ca9b6e77b041a5a5c40598a7267, type: 3}
+    - {fileID: 2800000, guid: 2d2e9b702b9dc20418741c36f06c90b5, type: 3}
     - {fileID: 2800000, guid: 939cf700d9f1e0344914a17bda374b4a, type: 3}
     - {fileID: 2800000, guid: 7e5ce0d678f92704a9674a80dc521664, type: 3}
     - {fileID: 2800000, guid: 9c0b0fd4eb2445f4cabe4b5febe52f66, type: 3}

+ 10 - 0
Assets/Scripts/GameData/ExcelConfig/SentimentConfig.cs

@@ -44,6 +44,16 @@ namespace Excel2Json
 #endif
 		
 
+		/// <summary>
+		///图片
+		/// </summary>
+#if !COMBAT_SERVER
+		public string icon_Text;
+#else
+		public string icon_Text{ set; get; }
+#endif
+		
+
 		/// <summary>
 		///核心感悟点
 		/// </summary>

+ 5 - 2
Assets/Scripts/GameUI/UI/SentimentPanel/SentimentEffectWidget.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using Core.Language;
 using Excel2Json;
 using Fort23.UTool;
@@ -41,15 +42,16 @@ namespace Fort23.Mono
             int conFigId = sentimentProperty.groupId * 10 + level;
             sentimentEffectConfig = ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId);
             Text_Name.text = LanguageManager.Instance.Text(sentimentEffectConfig.name);
+            var _sentimentEffectConfigs = ConfigComponent.Instance.GetAll<SentimentEffectConfig>();
+            var currentGroupSentimentEffectConfigs = _sentimentEffectConfigs.Where(se => se.groupId == sentimentEffectConfig.groupId).ToList();
             if (sentimentProperty.level == 0)
             {
                 Text_Level.text = "未激活";
             }
             else
             {
-                Text_Level.text = "lv." + level;
+                Text_Level.text = level + "/" + currentGroupSentimentEffectConfigs.Count;
             }
-      
         }
 
         public async void CreatXian(RectTransform root, SentimentEffectWidget lastSentimentWidget)
@@ -102,6 +104,7 @@ namespace Fort23.Mono
             {
                 UIManager.Instance.DormancyGComponent(sentimentXianWidget);
             }
+
             _sentimentXianWidgets.Clear();
 
             base.DormancyObj();

+ 8 - 6
Assets/Scripts/GameUI/UI/SentimentPanel/SentimentInfoPanel.cs

@@ -27,7 +27,6 @@ namespace Fort23.Mono
         private SentimentEffectWidget currentSentimentEffectWidget;
 
 
-
         private ItemWidgetType1 _itemWidgetType1;
 
         private void Init()
@@ -73,7 +72,6 @@ namespace Fort23.Mono
 
                 AccountFileInfo.Instance.SavePlayerData();
             });
-            Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
             Btn_LingWu.onClick.AddListener(() =>
             {
                 if (curretnSentimentProperty == null)
@@ -81,7 +79,7 @@ namespace Fort23.Mono
                     return;
                 }
 
-                if (currentSentimentEffectWidget.lastSentimentWidget.sentimentProperty.level < currentSentimentEffectWidget.sentimentEffectConfig.unlockLevel)
+                if (currentSentimentEffectWidget.lastSentimentWidget != null && currentSentimentEffectWidget.lastSentimentWidget.sentimentProperty.level < currentSentimentEffectWidget.sentimentEffectConfig.unlockLevel)
                 {
                     TipMessagePanel.OpenTipMessagePanel("前置节点没有解锁");
                     return;
@@ -153,7 +151,7 @@ namespace Fort23.Mono
             int level1 = sentimentData.sentimentProperties[0].level <= 0 ? 1 : sentimentData.sentimentProperties[0].level;
             int conFigId1 = sentimentData.sentimentProperties[0].groupId * 10 + level1;
             var sentimentEffectConfig1 = ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId1);
-             energyWidget =
+            energyWidget =
                 await UIManager.Instance.CreateGComponent<EnergyWidget>(null, Group_ResourceBar);
             energyWidget.CustomInit(sentimentEffectConfig1.upConstItemId);
 
@@ -222,11 +220,13 @@ namespace Fort23.Mono
 
             if (curretnSentimentProperty.level >= currentGroupSentimentEffectConfigs.Count)
             {
-                Text_Level.text = $"{curretnSentimentProperty.level}级 ——> MAX级";
+                Text_CurrentLevel.text = $"{curretnSentimentProperty.level}级 ";
+                Text_NextLevel.text = $"MAX级";
             }
             else
             {
-                Text_Level.text = $"{curretnSentimentProperty.level}级 ——> {curretnSentimentProperty.level + 1}级";
+                Text_CurrentLevel.text = $"{curretnSentimentProperty.level}级 ";
+                Text_NextLevel.text = $"{curretnSentimentProperty.level + 1}级";
             }
         }
 
@@ -236,6 +236,8 @@ namespace Fort23.Mono
             currentSentimentEffectWidget = sentimentEffectWidget;
             curretnSentimentProperty = sentimentEffectWidget.sentimentProperty;
 
+            Text_EffectName.text = LanguageManager.Instance.Text(sentimentEffectWidget.sentimentEffectConfig.name);
+
 
             UpdateUi();
         }

+ 33 - 22
Assets/Scripts/GameUI/UI/SentimentPanel/SentimentInfoPanelData.cs

@@ -8,17 +8,6 @@ namespace Fort23.Mono
 	public partial class SentimentInfoPanel 
 	{
 	  #region 自定义数据 
-	  private Button _Btn_Close;
-	  public Button Btn_Close
-	   {
-	   get{
-	      if (_Btn_Close == null)
-	       {
-	         _Btn_Close  = GetUIUnit<Button>("Btn_Close"); 
-	       }
-	      return _Btn_Close;
-	     }
-	   }
 	  private GameObject _MainSentimentEffectWidget;
 	  public GameObject MainSentimentEffectWidget
 	   {
@@ -63,17 +52,6 @@ namespace Fort23.Mono
 	      return _Text_Desc;
 	     }
 	   }
-	  private Text _Text_Level;
-	  public Text Text_Level
-	   {
-	   get{
-	      if (_Text_Level == null)
-	       {
-	         _Text_Level  = GetUIUnit<Text>("Text_Level"); 
-	       }
-	      return _Text_Level;
-	     }
-	   }
 	  private Button _Btn_LingWu;
 	  public Button Btn_LingWu
 	   {
@@ -140,6 +118,39 @@ namespace Fort23.Mono
 	      return _Group_ResourceBar;
 	     }
 	   }
+	  private Text _Text_CurrentLevel;
+	  public Text Text_CurrentLevel
+	   {
+	   get{
+	      if (_Text_CurrentLevel == null)
+	       {
+	         _Text_CurrentLevel  = GetUIUnit<Text>("Text_CurrentLevel"); 
+	       }
+	      return _Text_CurrentLevel;
+	     }
+	   }
+	  private Text _Text_NextLevel;
+	  public Text Text_NextLevel
+	   {
+	   get{
+	      if (_Text_NextLevel == null)
+	       {
+	         _Text_NextLevel  = GetUIUnit<Text>("Text_NextLevel"); 
+	       }
+	      return _Text_NextLevel;
+	     }
+	   }
+	  private Text _Text_EffectName;
+	  public Text Text_EffectName
+	   {
+	   get{
+	      if (_Text_EffectName == null)
+	       {
+	         _Text_EffectName  = GetUIUnit<Text>("Text_EffectName"); 
+	       }
+	      return _Text_EffectName;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

二进制
Excel2Json/Excel/Sentiment.xlsx


文件差异内容过多而无法显示
+ 0 - 0
UGUIPack/uguiconfig.db


文件差异内容过多而无法显示
+ 0 - 0
美术/unity_use_ui/TextrueJson/tongyong.txt


二进制
美术/unity_use_ui/decorate/dec_xinjing_zi.png


部分文件因为文件数量过多而无法显示