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

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: 

Assets/Editor/CombatEditor/HeroEntityCombatReport.cs

@@ -160,6 +160,8 @@ namespace xy002Editor.CombatEditor
                 combatReportEntityInfo.allBeiZhiLiao);
             DrwaBattleReportValueDataModule(combatReportEntityInfo.CombatInfoModule, shangHangXingXi,
                 combatReportEntityInfo.allHarm);
+            shangHangXingXi.CrendHarmValue("每秒伤害",  combatReportEntityInfo.allHarm/CombatReportManager.Instance.combatTime,
+                combatReportEntityInfo.allHarm);
             DrwaBattleReportValueDataModule(combatReportEntityInfo.InjuredInfoModule, shouDaoShangHangXingXi,
                 combatReportEntityInfo.allChengShang);
             DrwaBattleReportValueDataModule(combatReportEntityInfo.gongFaBeiXueRuo, gongFaBeiXueRuo);

Assets/Res/Config/HeroModelConfig.json

@@ -66,7 +66,7 @@
       "model": "Guixiu01",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 85,
+      "attack": 70,
       "hp": 89,
       "def": 50,
       "shield": 72,
@@ -182,7 +182,7 @@
       "model": "Guixiu01",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 95,
+      "attack": 75,
       "hp": 80,
       "def": 50,
       "shield": 63,
@@ -240,7 +240,7 @@
       "model": "Guixiu01",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 95,
+      "attack": 80,
       "hp": 80,
       "def": 50,
       "shield": 63,
@@ -298,7 +298,7 @@
       "model": "Boss_Tree_xiao",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 95,
+      "attack": 50,
       "hp": 80,
       "def": 50,
       "shield": 63,
@@ -353,11 +353,11 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx5001",
-      "model": "Guixiu01",
+      "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 95,
-      "hp": 80,
+      "attack": 90,
+      "hp": 95,
       "def": 50,
       "shield": 63,
       "speed_atk": 0.0,
@@ -411,11 +411,11 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx5002",
-      "model": "Guixiu01",
+      "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 95,
-      "hp": 80,
+      "attack": 90,
+      "hp": 95,
       "def": 50,
       "shield": 63,
       "speed_atk": 0.0,
@@ -469,11 +469,11 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx5003",
-      "model": "Guixiu01",
+      "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 95,
-      "hp": 80,
+      "attack": 90,
+      "hp": 95,
       "def": 50,
       "shield": 63,
       "speed_atk": 0.0,
@@ -527,11 +527,11 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx5004",
-      "model": "Guixiu01",
+      "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 95,
-      "hp": 80,
+      "attack": 90,
+      "hp": 95,
       "def": 50,
       "shield": 63,
       "speed_atk": 0.0,
@@ -585,11 +585,11 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx5005",
-      "model": "Guixiu01",
+      "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 95,
-      "hp": 80,
+      "attack": 90,
+      "hp": 95,
       "def": 50,
       "shield": 63,
       "speed_atk": 0.0,
@@ -646,8 +646,8 @@
       "model": "Guixiu01",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 95,
-      "hp": 80,
+      "attack": 90,
+      "hp": 95,
       "def": 50,
       "shield": 63,
       "speed_atk": 0.0,
@@ -704,8 +704,8 @@
       "model": "Boss_QiongQi",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 95,
-      "hp": 80,
+      "attack": 80,
+      "hp": 95,
       "def": 50,
       "shield": 63,
       "speed_atk": 0.0,
@@ -719,9 +719,9 @@
       "skillID": [
         -1,
         9051,
-        -1,
+        0,
         9052,
-        9051,
+        -1,
         -1,
         9053,
         -1,
@@ -821,7 +821,7 @@
       "isUseGpu": false,
       "heroType": 4,
       "attack": 35,
-      "hp": 150,
+      "hp": 80,
       "def": 50,
       "shield": 0,
       "speed_atk": 0.0,
@@ -937,7 +937,7 @@
       "isUseGpu": false,
       "heroType": 4,
       "attack": 35,
-      "hp": 150,
+      "hp": 100,
       "def": 50,
       "shield": 0,
       "speed_atk": 0.0,

Assets/Res/Config/HeroQiangDuAddConfig.json

@@ -0,0 +1,244 @@
+{
+  "configList": [
+    {
+      "ID": 1,
+      "qiangDuZhi": 1.0
+    },
+    {
+      "ID": 2,
+      "qiangDuZhi": 1.085
+    },
+    {
+      "ID": 3,
+      "qiangDuZhi": 1.17
+    },
+    {
+      "ID": 4,
+      "qiangDuZhi": 1.255
+    },
+    {
+      "ID": 5,
+      "qiangDuZhi": 1.34
+    },
+    {
+      "ID": 6,
+      "qiangDuZhi": 1.425
+    },
+    {
+      "ID": 7,
+      "qiangDuZhi": 1.51
+    },
+    {
+      "ID": 8,
+      "qiangDuZhi": 1.595
+    },
+    {
+      "ID": 9,
+      "qiangDuZhi": 1.68
+    },
+    {
+      "ID": 10,
+      "qiangDuZhi": 1.765
+    },
+    {
+      "ID": 11,
+      "qiangDuZhi": 1.85
+    },
+    {
+      "ID": 12,
+      "qiangDuZhi": 1.935
+    },
+    {
+      "ID": 13,
+      "qiangDuZhi": 2.02
+    },
+    {
+      "ID": 14,
+      "qiangDuZhi": 2.105
+    },
+    {
+      "ID": 15,
+      "qiangDuZhi": 2.19
+    },
+    {
+      "ID": 16,
+      "qiangDuZhi": 2.275
+    },
+    {
+      "ID": 17,
+      "qiangDuZhi": 2.36
+    },
+    {
+      "ID": 18,
+      "qiangDuZhi": 2.445
+    },
+    {
+      "ID": 19,
+      "qiangDuZhi": 2.53
+    },
+    {
+      "ID": 20,
+      "qiangDuZhi": 2.615
+    },
+    {
+      "ID": 21,
+      "qiangDuZhi": 2.7
+    },
+    {
+      "ID": 22,
+      "qiangDuZhi": 2.785
+    },
+    {
+      "ID": 23,
+      "qiangDuZhi": 2.87
+    },
+    {
+      "ID": 24,
+      "qiangDuZhi": 2.955
+    },
+    {
+      "ID": 25,
+      "qiangDuZhi": 3.04
+    },
+    {
+      "ID": 26,
+      "qiangDuZhi": 3.125
+    },
+    {
+      "ID": 27,
+      "qiangDuZhi": 3.21
+    },
+    {
+      "ID": 28,
+      "qiangDuZhi": 3.295
+    },
+    {
+      "ID": 29,
+      "qiangDuZhi": 3.38
+    },
+    {
+      "ID": 30,
+      "qiangDuZhi": 3.465
+    },
+    {
+      "ID": 31,
+      "qiangDuZhi": 3.55
+    },
+    {
+      "ID": 32,
+      "qiangDuZhi": 3.635
+    },
+    {
+      "ID": 33,
+      "qiangDuZhi": 3.72
+    },
+    {
+      "ID": 34,
+      "qiangDuZhi": 3.805
+    },
+    {
+      "ID": 35,
+      "qiangDuZhi": 3.89
+    },
+    {
+      "ID": 36,
+      "qiangDuZhi": 3.975
+    },
+    {
+      "ID": 37,
+      "qiangDuZhi": 4.06
+    },
+    {
+      "ID": 38,
+      "qiangDuZhi": 4.145
+    },
+    {
+      "ID": 39,
+      "qiangDuZhi": 4.23
+    },
+    {
+      "ID": 40,
+      "qiangDuZhi": 4.315
+    },
+    {
+      "ID": 41,
+      "qiangDuZhi": 4.4
+    },
+    {
+      "ID": 42,
+      "qiangDuZhi": 4.485
+    },
+    {
+      "ID": 43,
+      "qiangDuZhi": 4.57
+    },
+    {
+      "ID": 44,
+      "qiangDuZhi": 4.655
+    },
+    {
+      "ID": 45,
+      "qiangDuZhi": 4.74
+    },
+    {
+      "ID": 46,
+      "qiangDuZhi": 4.825
+    },
+    {
+      "ID": 47,
+      "qiangDuZhi": 4.91
+    },
+    {
+      "ID": 48,
+      "qiangDuZhi": 4.995
+    },
+    {
+      "ID": 49,
+      "qiangDuZhi": 5.08
+    },
+    {
+      "ID": 50,
+      "qiangDuZhi": 5.165
+    },
+    {
+      "ID": 51,
+      "qiangDuZhi": 5.25
+    },
+    {
+      "ID": 52,
+      "qiangDuZhi": 5.335
+    },
+    {
+      "ID": 53,
+      "qiangDuZhi": 5.42
+    },
+    {
+      "ID": 54,
+      "qiangDuZhi": 5.505
+    },
+    {
+      "ID": 55,
+      "qiangDuZhi": 5.59
+    },
+    {
+      "ID": 56,
+      "qiangDuZhi": 5.675
+    },
+    {
+      "ID": 57,
+      "qiangDuZhi": 5.76
+    },
+    {
+      "ID": 58,
+      "qiangDuZhi": 5.845
+    },
+    {
+      "ID": 59,
+      "qiangDuZhi": 5.93
+    },
+    {
+      "ID": 60,
+      "qiangDuZhi": 6.0
+    }
+  ]
+}

Assets/Res/Config/HeroQiangDuAddConfig.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: BnIbsy35Vi2KMZtjnckYH5eQtLi14wwB97eeRDnLDFaWLqVt88OV+kleyTcb
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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,

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
     },
     {

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

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}

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

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}

Assets/Scenes/testCombat.scene

@@ -2258,7 +2258,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].hp
-      value: 4337300
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].mu
@@ -2270,11 +2270,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].att
-      value: 1353
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].def
-      value: 708
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].huo
@@ -2290,7 +2290,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].hp
-      value: 200000
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].level
@@ -2314,7 +2314,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].heroID
-      value: 5007
+      value: 5001
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[1].heroID
@@ -2394,7 +2394,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

Assets/Scripts/GameData/ExcelConfig/HeroQiangDuAddConfig.cs

@@ -0,0 +1,40 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\HeroPowerUp.xlsx. SheetName: HeroQiangDuAddConfig
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "HeroQiangDuAddConfig.json")]
+	public partial class HeroQiangDuAddConfigHolder : ConfigHolder<HeroQiangDuAddConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct HeroQiangDuAddConfig : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///ID
+		/// </summary>
+#if !COMBAT_SERVER
+		public int ID;
+#else
+		public int ID{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///玩家修为境界（等级）
+		/// </summary>
+#if !COMBAT_SERVER
+		public float qiangDuZhi;
+#else
+		public float qiangDuZhi{ set; get; }
+#endif
+		
+
+	}
+
+}
+// End of Auto Generated Code

Assets/Scripts/GameData/ExcelConfig/HeroQiangDuAddConfig.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: DStOtC7+V3J3kbsJMCcMm4oPQ7FNIuSvpgkafJhrUFhsZBJn7zqQwieTAqlZ
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameData/ExcelConfig/MonsterPowerUpConfig.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: BykYvCz8AHMu6eiC4GxIBi0okPi2/MUn7QB8wL3HZ6PKrsX9NCF6cmI=
+guid: BykYvCz8AHMu6eiC4GxIBi0okPi2/MUn7QB8wL3HZ6PKsM/hah5xYSEnSR+I
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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>

Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\skill.xlsx. SheetName: SkillConfig
+// Generate From Excel\Skill.xlsx. SheetName: SkillConfig
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/SkillConstant.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\skill.xlsx. SheetName: SkillConstant
+// Generate From Excel\Skill.xlsx. SheetName: SkillConstant
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/SkillPowerupConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\skill.xlsx. SheetName: SkillPowerupConfig
+// Generate From Excel\Skill.xlsx. SheetName: SkillPowerupConfig
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameLogic/Combat/CombatTool/CombatReport/CombatReportEntityInfo.cs

@@ -53,6 +53,7 @@ namespace GameLogic.Combat.CombatTool.CombatReport
         public long allBeiZhiLiao = 0;
         public long allChengShang = 0;
 
+        
         public void Init(CombatHeroEntity combatHeroEntity)
         {
             CombatHeroEntity = combatHeroEntity;

Assets/Scripts/GameLogic/Combat/CombatTool/CombatReport/CombatReportManager.cs

@@ -7,6 +7,7 @@ namespace GameLogic.Combat.CombatTool.CombatReport
     {
         public List<CombatReportEntityInfo> allCombatReportInfo = new List<CombatReportEntityInfo>();
 
+        public float combatTime;
         public int CombatId = 0;
 #if COMBAT_SERVER
         public bool isSaveCombat = false;
@@ -48,6 +49,7 @@ namespace GameLogic.Combat.CombatTool.CombatReport
 
         public void Update()
         {
+            combatTime = CombatController.currActiveCombat.combatTime;
             for (int i = 0; i < allCombatReportInfo.Count; i++)
             {
                 allCombatReportInfo[i].Update();

Assets/Scripts/GameLogic/Combat/Skill/S9013.cs

@@ -52,7 +52,7 @@ namespace GameLogic.Combat.Skill
                         CombatHeroEntity.MaxCombatHeroInfo.hp.Value, 10);
                     BuffInfo buffInfo = BuffInfo.GetBuffInfo(10151, -1, 1);
                     BuffBasic = CombatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
-                    isActiveFuHuo = true;
+                   
                     count++;
                     CombatHeroEntity.CombatHeroSkillControl.This<CombatHeroSkillControl>().AddCommandSkill(this);
                     // SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos2");
@@ -64,6 +64,7 @@ namespace GameLogic.Combat.Skill
         {
             _finishTimeLineGroupName = "-1";
             ActivationTimeLineData("9013");
+            isActiveFuHuo = true;
         }
 
         protected override void ProCombatUpdate(float time)
@@ -74,8 +75,9 @@ namespace GameLogic.Combat.Skill
             }
 
             _currTime += time;
-            if (_currTime > 0.5f)
+            if (_currTime > 0.2f)
             {
+                _currTime = 0;
                 Recover(CombatHeroEntity, CombatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(), addHp, AttType.Skill);
                 if (CombatHeroEntity.CurrCombatHeroInfo.hp.Value >= CombatHeroEntity.MaxCombatHeroInfo.hp.Value)
                 {
@@ -88,7 +90,8 @@ namespace GameLogic.Combat.Skill
                     CombatHeroEntity.CurrCombatHeroInfo.Water += v;
                     CombatHeroEntity.CurrCombatHeroInfo.Fire += v;
                     CombatHeroEntity.CurrCombatHeroInfo.Earth += v;
-
+                    CombatHeroEntity.BuffControl.RemoveBuff(BuffBasic);
+                    BuffBasic = null;
                     S9014 s9014 = CombatHeroEntity.CombatHeroSkillControl.GetSkillBasic<S9014>();
                     if (s9014 != null)
                     {

Assets/Scripts/GameLogic/Combat/Skill/S9014.cs

@@ -17,6 +17,7 @@ namespace GameLogic.Combat.Skill
         private int currCount;
         private bool isUpdate;
 
+        private int currInitCount;
         protected override void ProActiveSkill()
         {
             isActive = false;
@@ -27,7 +28,9 @@ namespace GameLogic.Combat.Skill
             isUpdate = true;
             currCount = 0;
             currTime = 0;
-            ballisticsCount = (int)effectValue[0];
+            currInitCount = 0;
+            
+        
             // for (int i = 0; i < effectValue[0]; i++)
             // {
             //     CombatHeroHitPoint combatHeroHitPoint = CombatHeroEntity.CombatAIBasic.currFocusTarget
@@ -71,16 +74,36 @@ namespace GameLogic.Combat.Skill
             currTime += time;
             if (currTime > 0.2f)
             {
+                currInitCount++;
                 currTime = 0;
-                CombatHeroHitPoint combatHeroHitPoint = CombatHeroEntity.CombatAIBasic.currFocusTarget
-                    .GetThis<CombatHeroEntity>()
-                    .GetMainHotPoin<CombatHeroHitPoint>();
+             
                 // Vector3 pos = (combatHeroHitPoint.combatHeroEntity.dotPos - CombatHeroEntity.dotPos);
+                Vector3 startPos =Vector3.zero;
+                Vector3 endPos=Vector3.zero;
+                if (currInitCount % 3 == 0&&CombatHeroEntity.CombatAIBasic.currFocusTarget!=null)
+                {
+                    if (currCount >= effectValue[0])
+                    {
+                        isUpdate = false;
+                        return;
+                    }
+                    CombatHeroHitPoint combatHeroHitPoint = CombatHeroEntity.CombatAIBasic.currFocusTarget
+                        .GetThis<CombatHeroEntity>()
+                        .GetMainHotPoin<CombatHeroHitPoint>();
+                    currCount++;
+                    endPos = combatHeroHitPoint.combatHeroEntity.dotPos+new Vector3(0,0.5f,0);
+                    startPos =
+                        combatHeroHitPoint.combatHeroEntity.combatHeroGameObject.transform.TransformPoint(10, 10, 0);
+                }
+                else
+                {
+                    float x = CombatCalculateTool.Instance.GetOdd(-5, 3);
+                    float z = CombatCalculateTool.Instance.GetOdd(3, 12);
+                     startPos = CombatHeroEntity.GameObject.transform.TransformPoint(x, 10, z);
+                     endPos=CombatHeroEntity.GameObject.transform.TransformPoint(x+10, -30, z);
+                }
 
-                float x = CombatCalculateTool.Instance.GetOdd(-5, 3);
-                float z = CombatCalculateTool.Instance.GetOdd(3, 12);
-                Vector3 startPos = CombatHeroEntity.GameObject.transform.TransformPoint(x, 10, z);
-                Vector3 endPos=CombatHeroEntity.GameObject.transform.TransformPoint(x+10, -30, z);
+            
                 
                 // SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos2");
                 ActivationTimeLineData("9014",

Assets/Scripts/GameLogic/Combat/Skill/S9062.cs

@@ -1,5 +1,6 @@
 using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
 using Common.Utility.CombatEvent;
+using Core.Utility;
 using Fort23.Core;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Hero;
@@ -75,6 +76,9 @@ namespace GameLogic.Combat.Skill
                 heroEntity.IsEnemy = true;
                 CombatHeroInfo combatHeroInfo = new CombatHeroInfo();
                 combatHeroInfo.InitMonster(1005, CombatHeroEntity.CurrCombatHeroInfo.level.Value);
+                combatHeroInfo.hp =(EncryptionLong)
+                    CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.MaxCombatHeroInfo.hp.Value,
+                        effectValue[1]);
                 CombatController.currActiveCombat.CombatHeroController.SummonHero(combatHeroInfo, CombatHeroEntity,
                     pos[i], -1, null);
             }

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -2,6 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using Core.Language;
+using Core.Utility;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
@@ -58,7 +59,9 @@ public class PlayerManager : Singleton<PlayerManager>
         {
             if (qiankundaiConfig.dropType == 1)
             {
-                AccountFileInfo.QiankundaiData qiankundaiData = AccountFileInfo.Instance.playerData.QiankundaiDatas.FirstOrDefault(q => q.id == qiankundaiConfig.ID);
+                AccountFileInfo.QiankundaiData qiankundaiData =
+                    AccountFileInfo.Instance.playerData.QiankundaiDatas.FirstOrDefault(q =>
+                        q.id == qiankundaiConfig.ID);
                 if (qiankundaiData == null)
                 {
                     qiankundaiData = new AccountFileInfo.QiankundaiData();
@@ -95,7 +98,8 @@ public class PlayerManager : Singleton<PlayerManager>
         {
             if (qiankundaiConfig.dropType == 2)
             {
-                if (myHero.powerUpConfig.ID >= qiankundaiConfig.dropLevel[0] && myHero.powerUpConfig.ID <= qiankundaiConfig.dropLevel[1])
+                if (myHero.powerUpConfig.ID >= qiankundaiConfig.dropLevel[0] &&
+                    myHero.powerUpConfig.ID <= qiankundaiConfig.dropLevel[1])
                 {
                     configs.Add(qiankundaiConfig);
                 }
@@ -108,7 +112,8 @@ public class PlayerManager : Singleton<PlayerManager>
     //添加心境
     public void AddSentimentData(int id)
     {
-        AccountFileInfo.SentimentData sentimentData = AccountFileInfo.Instance.playerData.SentimentDatas.FirstOrDefault(sd => sd.id == id);
+        AccountFileInfo.SentimentData sentimentData =
+            AccountFileInfo.Instance.playerData.SentimentDatas.FirstOrDefault(sd => sd.id == id);
         if (sentimentData != null)
         {
             LogTool.Error("已经用心境 id：" + id);
@@ -165,7 +170,9 @@ public class PlayerManager : Singleton<PlayerManager>
 
             if (daoyou.Count > 0)
             {
-                GuaijiDaoYou.Add(TimeHelper.ClientNow() + Random.Range(gameConstantConfig.DaoyouguajiDuration[0], gameConstantConfig.DaoyouguajiDuration[1]) * 1000, daoyou);
+                GuaijiDaoYou.Add(
+                    TimeHelper.ClientNow() + Random.Range(gameConstantConfig.DaoyouguajiDuration[0],
+                        gameConstantConfig.DaoyouguajiDuration[1]) * 1000, daoyou);
                 EventManager.Instance.Dispatch(CustomEventType.DaoYouCounUpdate, null);
             }
 
@@ -183,7 +190,8 @@ public class PlayerManager : Singleton<PlayerManager>
 
     public int GetBl(AccountFileInfo.DaoYouData daoYouData, int guajibuffId)
     {
-        DaoyouLevelupConfig daoyouLevelupConfig = ConfigComponent.Instance.Get<DaoyouLevelupConfig>(daoYouData.favorabilityLv);
+        DaoyouLevelupConfig daoyouLevelupConfig =
+            ConfigComponent.Instance.Get<DaoyouLevelupConfig>(daoYouData.favorabilityLv);
         int level = GetDaoYouLevel(daoYouData);
         DaoyouguajiResourcLevel daoyouguajiResourcLevel = ConfigComponent.Instance.Get<DaoyouguajiResourcLevel>(level);
         guajibuff guajibuff = ConfigComponent.Instance.Get<guajibuff>(guajibuffId);
@@ -297,8 +305,10 @@ public class PlayerManager : Singleton<PlayerManager>
                 foreach (var playerDataQiankundaiData in AccountFileInfo.Instance.playerData.QiankundaiDatas)
                 {
                     //重置掉落次数
-                    QiankundaiConfig qiankundaiConfig = ConfigComponent.Instance.Get<QiankundaiConfig>(playerDataQiankundaiData.id);
-                    if (qiankundaiConfig.dropType != 2 && TimeHelper.ClientNow() >= playerDataQiankundaiData.refenceTime)
+                    QiankundaiConfig qiankundaiConfig =
+                        ConfigComponent.Instance.Get<QiankundaiConfig>(playerDataQiankundaiData.id);
+                    if (qiankundaiConfig.dropType != 2 &&
+                        TimeHelper.ClientNow() >= playerDataQiankundaiData.refenceTime)
                     {
                         if (qiankundaiConfig.dropPara1 == 1)
                         {
@@ -306,7 +316,8 @@ public class PlayerManager : Singleton<PlayerManager>
                         }
                         else if (qiankundaiConfig.dropPara1 == 2)
                         {
-                            playerDataQiankundaiData.refenceTime = TimeHelper.GetBaseRefreshTime(TimeHelper.ClientNow());
+                            playerDataQiankundaiData.refenceTime =
+                                TimeHelper.GetBaseRefreshTime(TimeHelper.ClientNow());
                         }
                         else if (qiankundaiConfig.dropPara1 == 3)
                         {
@@ -316,9 +327,11 @@ public class PlayerManager : Singleton<PlayerManager>
                     }
 
 
-                    if (myHero.powerUpConfig.ID >= qiankundaiConfig.dropLevel[0] && myHero.powerUpConfig.ID <= qiankundaiConfig.dropLevel[1])
+                    if (myHero.powerUpConfig.ID >= qiankundaiConfig.dropLevel[0] &&
+                        myHero.powerUpConfig.ID <= qiankundaiConfig.dropLevel[1])
                     {
-                        if (playerDataQiankundaiData.dropCount < qiankundaiConfig.dropPara2 || qiankundaiConfig.dropPara2 == -1)
+                        if (playerDataQiankundaiData.dropCount < qiankundaiConfig.dropPara2 ||
+                            qiankundaiConfig.dropPara2 == -1)
                         {
                             playerDataQiankundaiData.dropTime++;
                             if (playerDataQiankundaiData.dropTime >= qiankundaiConfig.dropTypePara)
@@ -326,10 +339,13 @@ public class PlayerManager : Singleton<PlayerManager>
                                 //发放奖励
                                 for (var i = 0; i < qiankundaiConfig.ChoukaID.Length; i++)
                                 {
-                                    List<ItemInfo>  itemInfos = DropManager.Instance.Drop(qiankundaiConfig.ChoukaID[i], qiankundaiConfig.DropCount[i]);
+                                    List<ItemInfo> itemInfos = DropManager.Instance.Drop(qiankundaiConfig.ChoukaID[i],
+                                        qiankundaiConfig.DropCount[i]);
                                     foreach (var itemInfo in itemInfos)
                                     {
-                                        AccountFileInfo.ItemData itemData = AccountFileInfo.Instance.playerData.QiankundaiItemDatas.FirstOrDefault(i => i.itemId == itemInfo.itemID);
+                                        AccountFileInfo.ItemData itemData =
+                                            AccountFileInfo.Instance.playerData.QiankundaiItemDatas.FirstOrDefault(i =>
+                                                i.itemId == itemInfo.itemID);
                                         if (itemData != null)
                                         {
                                             itemData.itemCount += itemInfo.count.Value;
@@ -340,7 +356,6 @@ public class PlayerManager : Singleton<PlayerManager>
                                             AccountFileInfo.Instance.playerData.QiankundaiItemDatas.Add(itemData);
                                         }
                                     }
-                                  
                                 }
 
                                 playerDataQiankundaiData.dropCount = 0;
@@ -374,7 +389,8 @@ public class PlayerManager : Singleton<PlayerManager>
 
                 foreach (var daoYouData in keyValuePair.Value)
                 {
-                    DaoyouModelConfig daoyouModelConfig = ConfigComponent.Instance.Get<DaoyouModelConfig>(daoYouData.id);
+                    DaoyouModelConfig daoyouModelConfig =
+                        ConfigComponent.Instance.Get<DaoyouModelConfig>(daoYouData.id);
                     int bl = GetBl(daoYouData, daoyouModelConfig.guajiBuffID[0]);
 
                     int randomValue1 = Random.Range(0, 101);
@@ -384,7 +400,8 @@ public class PlayerManager : Singleton<PlayerManager>
                         for (var i = 1; i < daoyouModelConfig.guajiBuffID.Length; i++)
                         {
                             int count = GetBl(daoYouData, daoyouModelConfig.guajiBuffID[i]);
-                            guajibuff guajibuff = ConfigComponent.Instance.Get<guajibuff>(daoyouModelConfig.guajiBuffID[i]);
+                            guajibuff guajibuff =
+                                ConfigComponent.Instance.Get<guajibuff>(daoyouModelConfig.guajiBuffID[i]);
                             switch (guajibuff.paraValue)
                             {
                                 case 1:
@@ -492,6 +509,14 @@ public class PlayerManager : Singleton<PlayerManager>
             }
         }
 
+        float[] qiangDu = new float[] { 0, 35.7f, 98f, 138.7f, 199.3f, 216f };
+
+        int qiangDuLevelId = Mathf.CeilToInt(testHeroInfoConfig.level / 5f);
+        HeroQiangDuAddConfig heroQiangDuAddConfig = ConfigComponent.Instance.Get<HeroQiangDuAddConfig>(qiangDuLevelId);
+        int index = Mathf.RoundToInt(heroQiangDuAddConfig.qiangDuZhi);
+        myHero.hp = (EncryptionLong)(myHero.hp.Value * (qiangDu[index]/100f+1));
+        myHero.attack = (EncryptionLong)(myHero.attack.Value * (qiangDu[index]/100f+1));
+        myHero.defense = (EncryptionLong)(myHero.defense.Value * (qiangDu[index]/100f+1));
         // for (int i = 0; i < 4; i++)
         // {
         //     FaBaoControl.FightFaBao[i] = FaBaoControl.myAllFaBao[i];

Assets/Scripts/GameUI/UI/CombatPanel/BuffWidget.cs

@@ -46,11 +46,11 @@ namespace Fort23.Mono
             }
         }
 
-        public void Update()
+        public bool Update()
         {
-            if (buffBasic == null)
+            if (buffBasic == null||buffBasic.buffInf==null)
             {
-                return;
+                return false;
             }
 
             if (buffBasic.buffInf.buffTime > 0)
@@ -63,6 +63,7 @@ namespace Fort23.Mono
             }
 
             buffCount.text = buffBasic.buffCount.ToString();
+            return true;
         }
 
         public void InitBuff(BuffBasic buffBasic)

Assets/Scripts/GameUI/UI/CombatPanel/HeroHpWidget.cs

@@ -206,7 +206,12 @@ namespace Fort23.Mono
         {
             for (int i = 0; i < buBetterList.Count; i++)
             {
-                buBetterList[i].Update();
+              bool isoK=  buBetterList[i].Update();
+              if (!isoK)
+              {
+                  UIManager.Instance.DormancyGComponent( buBetterList[i]);
+                  buBetterList.RemoveAt(i);
+              }
             }
 
             if (!isFollowTarget)

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();

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();
         }

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)
 	{

UserSettings/Layouts/CurrentMaximizeLayout.dwlt

@@ -14,193 +14,21 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Children:
   - {fileID: 3}
-  - {fileID: 5}
-  - {fileID: 12}
-  - {fileID: 16}
+  - {fileID: 4}
+  - {fileID: 14}
+  - {fileID: 19}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
     width: 2560
-    height: 1299
-  m_MinSize: {x: 400, y: 100}
-  m_MaxSize: {x: 32384, y: 16192}
+    height: 1307
+  m_MinSize: {x: 500, y: 100}
+  m_MaxSize: {x: 40480, y: 16192}
   vertical: 0
-  controlID: 136
+  controlID: -1
   draggingID: 0
 --- !u!114 &2
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 1
-  m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 230, y: 250}
-  m_MaxSize: {x: 10000, y: 10000}
-  m_TitleContent:
-    m_Text: Project
-    m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: 1529
-    y: 744
-    width: 555
-    height: 607
-  m_SerializedDataModeController:
-    m_DataMode: 0
-    m_PreferredDataMode: 0
-    m_SupportedDataModes: 
-    isAutomatic: 1
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-    m_OverlaysVisible: 1
-  m_SearchFilter:
-    m_NameFilter: multiSheetInfo
-    m_ClassNames: []
-    m_AssetLabels: []
-    m_AssetBundleNames: []
-    m_ReferencingInstanceIDs: 
-    m_SceneHandles: 
-    m_ShowAllHits: 0
-    m_SkipHidden: 0
-    m_SearchArea: 1
-    m_Folders:
-    - Assets/Res/Config
-    m_Globs: []
-    m_OriginalText: multiSheetInfo
-    m_ImportLogFlags: 0
-    m_FilterByTypeIntersection: 0
-  m_ViewMode: 1
-  m_StartGridSize: 16
-  m_LastFolders:
-  - Assets/Res/Config
-  m_LastFoldersGridSize: 16
-  m_LastProjectPath: D:\unityProject\XiuXianGame
-  m_LockTracker:
-    m_IsLocked: 0
-  m_FolderTreeState:
-    scrollPos: {x: 0, y: 485}
-    m_SelectedIDs: 241f0100
-    m_LastClickedID: 73508
-    m_ExpandedIDs: 0000000062eb000064eb000066eb000068eb00006aeb00006ceb00006eeb000070eb000072eb000074eb000076eb000078eb00007aeb00007ceb00007eeb000080eb000082eb000084eb000086eb000088eb00008aeb00008ceb00008eeb000090eb000092eb000094eb000096eb000098eb00009aeb00009ceb0000d8ee000018ef000020ef000000ca9a3bffffff7f
-    m_RenameOverlay:
-      m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
-      m_EditFieldRect:
-        serializedVersion: 2
-        x: 0
-        y: 0
-        width: 0
-        height: 0
-      m_UserData: 0
-      m_IsWaitingForDelay: 0
-      m_IsRenaming: 0
-      m_OriginalEventType: 11
-      m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 15}
-    m_SearchString: 
-    m_CreateAssetUtility:
-      m_EndAction: {fileID: 0}
-      m_InstanceID: 0
-      m_Path: 
-      m_Icon: {fileID: 0}
-      m_ResourceFile: 
-  m_AssetTreeState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 
-    m_LastClickedID: 0
-    m_ExpandedIDs: 0000000062eb000064eb000066eb000068eb00006aeb00006ceb00006eeb000070eb000072eb000074eb000076eb000078eb00007aeb00007ceb00007eeb000080eb000082eb000084eb000086eb000088eb00008aeb00008ceb00008eeb000090eb000092eb000094eb000096eb000098eb00009aeb00009ceb0000
-    m_RenameOverlay:
-      m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
-      m_EditFieldRect:
-        serializedVersion: 2
-        x: 0
-        y: 0
-        width: 0
-        height: 0
-      m_UserData: 0
-      m_IsWaitingForDelay: 0
-      m_IsRenaming: 0
-      m_OriginalEventType: 11
-      m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 0}
-    m_SearchString: 
-    m_CreateAssetUtility:
-      m_EndAction: {fileID: 0}
-      m_InstanceID: 0
-      m_Path: 
-      m_Icon: {fileID: 0}
-      m_ResourceFile: 
-  m_ListAreaState:
-    m_SelectedInstanceIDs: 
-    m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: ccd40000ec17010052190100ae40010036aa0000bcb50000d0a9000020ba0000b402010062eb03000000000046860100ae5a010094b001004e610100a2d1010038890300a6aa0000feaa0000d2530400a4530400b0ff0000
-    m_RenameOverlay:
-      m_UserAcceptedRename: 0
-      m_Name: Boss_QiongQi
-      m_OriginalName: Boss_QiongQi
-      m_EditFieldRect:
-        serializedVersion: 2
-        x: 0
-        y: 0
-        width: 0
-        height: 0
-      m_UserData: 61504
-      m_IsWaitingForDelay: 0
-      m_IsRenaming: 0
-      m_OriginalEventType: 0
-      m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 15}
-    m_CreateAssetUtility:
-      m_EndAction: {fileID: 0}
-      m_InstanceID: 0
-      m_Path: 
-      m_Icon: {fileID: 0}
-      m_ResourceFile: 
-    m_NewAssetIndexInList: -1
-    m_ScrollPosition: {x: 0, y: 0}
-    m_GridSize: 16
-  m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 210
---- !u!114 &3
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: GameView
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 650
-    height: 1299
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 4}
-  m_Panes:
-  - {fileID: 4}
-  m_Selected: 0
-  m_LastSelected: 0
---- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -223,7 +51,7 @@ MonoBehaviour:
     x: 0
     y: 73
     width: 649
-    height: 1278
+    height: 1286
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -265,7 +93,7 @@ MonoBehaviour:
     m_VAllowExceedBaseRangeMax: 1
     m_ScaleWithWindow: 0
     m_HSlider: 0
-    m_VSlider: 0
+    m_VSlider: 1
     m_IgnoreScrollWheelUntilClicked: 0
     m_EnableMouseInput: 1
     m_EnableSliderZoomHorizontal: 0
@@ -277,28 +105,54 @@ MonoBehaviour:
       x: 0
       y: 21
       width: 649
-      height: 1257
-    m_Scale: {x: 0.7740148, y: 0.7740148}
-    m_Translation: {x: 324.5, y: 628.5}
+      height: 1265
+    m_Scale: {x: 0.7789409, y: 0.7789409}
+    m_Translation: {x: 324.5, y: 632.49994}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -419.24265
-      y: -812
-      width: 838.4853
-      height: 1624
+      x: -416.59128
+      y: -811.9999
+      width: 833.18256
+      height: 1623.9999
     m_MinimalGUI: 1
-  m_defaultScale: 0.7740148
-  m_LastWindowPixelSize: {x: 649, y: 1278}
+  m_defaultScale: 0.7789409
+  m_LastWindowPixelSize: {x: 649, y: 1286}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &5
+--- !u!114 &3
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: GameView
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 650
+    height: 1307
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 2}
+  m_Panes:
+  - {fileID: 2}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -311,20 +165,20 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 6}
-  - {fileID: 10}
+  - {fileID: 5}
+  - {fileID: 9}
   m_Position:
     serializedVersion: 2
     x: 650
     y: 0
     width: 879
-    height: 1299
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 8096, y: 16192}
+    height: 1307
+  m_MinSize: {x: 200, y: 100}
+  m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 53
+  controlID: 9901
   draggingID: 0
---- !u!114 &6
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -342,17 +196,17 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 879
-    height: 667
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 7}
+    height: 671
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 6}
   m_Panes:
+  - {fileID: 6}
   - {fileID: 7}
   - {fileID: 8}
-  - {fileID: 9}
   m_Selected: 0
   m_LastSelected: 1
---- !u!114 &7
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -375,7 +229,7 @@ MonoBehaviour:
     x: 650
     y: 73
     width: 877
-    height: 646
+    height: 650
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -760,9 +614,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -0.91, y: 0.48, z: 0.24}
+    m_Target: {x: 0, y: 5, z: 0}
     speed: 2
-    m_Value: {x: -0.91, y: 0.48, z: 0.24}
+    m_Value: {x: 0, y: 5, z: 0}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -808,13 +662,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0.23812318, y: -0.47960052, z: 0.13616201, w: 0.83374864}
+    m_Target: {x: 0.20093279, y: -0.521528, z: 0.1275995, w: 0.81947726}
     speed: 2
-    m_Value: {x: 0.23807602, y: -0.4795055, z: 0.13613504, w: 0.8335835}
+    m_Value: {x: -0.20093279, y: 0.521528, z: -0.1275995, w: -0.81947726}
   m_Size:
-    m_Target: 10
+    m_Target: 0.4330127
     speed: 2
-    m_Value: 10
+    m_Value: 0.4330127
   m_Ortho:
     m_Target: 0
     speed: 2
@@ -841,7 +695,7 @@ MonoBehaviour:
   m_SceneVisActive: 1
   m_LastLockedObject: {fileID: 0}
   m_ViewIsLockedToObject: 0
---- !u!114 &8
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -951,7 +805,7 @@ MonoBehaviour:
       type: {class: TransitionLibraryAliasesPage, ns: Animancer.Editor.TransitionLibraries, asm: Kybernetik.Animancer.Editor}
       data:
         _ScrollPosition: {x: 0, y: 0}
---- !u!114 &9
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1266,6 +1120,32 @@ MonoBehaviour:
     true,\n    \"m_EnergyConservingSpecular\": true,\n    \"m_ClearCoat\": false\n}\n\n"
   m_AssetMaybeChangedOnDisk: 0
   m_AssetMaybeDeleted: 0
+--- !u!114 &9
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 10}
+  - {fileID: 12}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 671
+    width: 879
+    height: 636
+  m_MinSize: {x: 200, y: 50}
+  m_MaxSize: {x: 16192, y: 8096}
+  vertical: 0
+  controlID: 9947
+  draggingID: 0
 --- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -1276,23 +1156,83 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: TimelineWindow
+  m_Name: ConsoleWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 667
-    width: 879
-    height: 632
-  m_MinSize: {x: 102, y: 121}
-  m_MaxSize: {x: 4002, y: 4021}
+    y: 0
+    width: 440
+    height: 636
+  m_MinSize: {x: 101, y: 121}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 11}
   m_Panes:
   - {fileID: 11}
   m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &11
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Console
+    m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 650
+    y: 744
+    width: 438
+    height: 615
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+--- !u!114 &12
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: TimelineWindow
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 440
+    y: 0
+    width: 439
+    height: 636
+  m_MinSize: {x: 102, y: 121}
+  m_MaxSize: {x: 4002, y: 4021}
+  m_ActualView: {fileID: 13}
+  m_Panes:
+  - {fileID: 13}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1312,10 +1252,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 650
-    y: 740
-    width: 877
-    height: 611
+    x: 1090
+    y: 744
+    width: 437
+    height: 615
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1335,7 +1275,7 @@ MonoBehaviour:
   m_SequencePath:
     m_SelectionRoot: 0
     m_SubElements: []
---- !u!114 &12
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1348,20 +1288,20 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 13}
   - {fileID: 15}
+  - {fileID: 17}
   m_Position:
     serializedVersion: 2
     x: 1529
     y: 0
     width: 557
-    height: 1299
+    height: 1307
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 137
+  controlID: 9964
   draggingID: 0
---- !u!114 &13
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1379,15 +1319,15 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 557
-    height: 671
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 14}
+    height: 675
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 16}
   m_Panes:
-  - {fileID: 14}
+  - {fileID: 16}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &14
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1410,7 +1350,7 @@ MonoBehaviour:
     x: 1529
     y: 73
     width: 555
-    height: 650
+    height: 654
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1424,9 +1364,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 
-      m_LastClickedID: 0
-      m_ExpandedIDs: 78faffff
+      m_SelectedIDs: 0e98ffff
+      m_LastClickedID: -26610
+      m_ExpandedIDs: c0b9fcffc6b9fcff24afffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -1442,7 +1382,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 13}
+        m_ClientGUIView: {fileID: 15}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -1450,7 +1390,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
---- !u!114 &15
+--- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1466,17 +1406,163 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 671
+    y: 675
     width: 557
-    height: 628
+    height: 632
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 2}
+  m_ActualView: {fileID: 18}
   m_Panes:
-  - {fileID: 2}
+  - {fileID: 18}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &16
+--- !u!114 &18
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 230, y: 250}
+  m_MaxSize: {x: 10000, y: 10000}
+  m_TitleContent:
+    m_Text: Project
+    m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 1529
+    y: 748
+    width: 555
+    height: 611
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_SearchFilter:
+    m_NameFilter: 
+    m_ClassNames: []
+    m_AssetLabels: []
+    m_AssetBundleNames: []
+    m_ReferencingInstanceIDs: 
+    m_SceneHandles: 
+    m_ShowAllHits: 0
+    m_SkipHidden: 0
+    m_SearchArea: 1
+    m_Folders:
+    - Assets/Art/ArtHero
+    m_Globs: []
+    m_OriginalText: 
+    m_ImportLogFlags: 0
+    m_FilterByTypeIntersection: 0
+  m_ViewMode: 1
+  m_StartGridSize: 16
+  m_LastFolders:
+  - Assets/Art/ArtHero
+  m_LastFoldersGridSize: 16
+  m_LastProjectPath: D:\Server\NetServer\NetServer\XiuXianGame
+  m_LockTracker:
+    m_IsLocked: 0
+  m_FolderTreeState:
+    scrollPos: {x: 0, y: 143}
+    m_SelectedIDs: c6650100
+    m_LastClickedID: 91590
+    m_ExpandedIDs: 00000000b26a0000786201007a6201007c6201007e62010080620100826201008462010086620100886201008a6201008c6201008e620100906201009262010000ca9a3bffffff7f
+    m_RenameOverlay:
+      m_UserAcceptedRename: 0
+      m_Name: 
+      m_OriginalName: 
+      m_EditFieldRect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 0
+        height: 0
+      m_UserData: 0
+      m_IsWaitingForDelay: 0
+      m_IsRenaming: 0
+      m_OriginalEventType: 11
+      m_IsRenamingFilename: 1
+      m_ClientGUIView: {fileID: 0}
+    m_SearchString: 
+    m_CreateAssetUtility:
+      m_EndAction: {fileID: 0}
+      m_InstanceID: 0
+      m_Path: 
+      m_Icon: {fileID: 0}
+      m_ResourceFile: 
+  m_AssetTreeState:
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: 
+    m_LastClickedID: 0
+    m_ExpandedIDs: 00000000b26a0000786201007a6201007c6201007e62010080620100826201008462010086620100886201008a6201008c6201008e620100906201009262010000ca9a3bffffff7f
+    m_RenameOverlay:
+      m_UserAcceptedRename: 0
+      m_Name: 
+      m_OriginalName: 
+      m_EditFieldRect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 0
+        height: 0
+      m_UserData: 0
+      m_IsWaitingForDelay: 0
+      m_IsRenaming: 0
+      m_OriginalEventType: 11
+      m_IsRenamingFilename: 1
+      m_ClientGUIView: {fileID: 0}
+    m_SearchString: 
+    m_CreateAssetUtility:
+      m_EndAction: {fileID: 0}
+      m_InstanceID: 0
+      m_Path: 
+      m_Icon: {fileID: 0}
+      m_ResourceFile: 
+  m_ListAreaState:
+    m_SelectedInstanceIDs: 0e98ffff
+    m_LastClickedInstanceID: -26610
+    m_HadKeyboardFocusLastEvent: 1
+    m_ExpandedInstanceIDs: ccd40000ec17010052190100ae40010036aa0000bcb50000d0a9000020ba0000b402010062eb03000000000046860100ae5a010094b001004e610100a2d1010038890300a6aa0000feaa0000d2530400a4530400b0ff0000
+    m_RenameOverlay:
+      m_UserAcceptedRename: 0
+      m_Name: 
+      m_OriginalName: 
+      m_EditFieldRect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 0
+        height: 0
+      m_UserData: 0
+      m_IsWaitingForDelay: 0
+      m_IsRenaming: 0
+      m_OriginalEventType: 11
+      m_IsRenamingFilename: 1
+      m_ClientGUIView: {fileID: 17}
+    m_CreateAssetUtility:
+      m_EndAction: {fileID: 0}
+      m_InstanceID: 0
+      m_Path: 
+      m_Icon: {fileID: 0}
+      m_ResourceFile: 
+    m_NewAssetIndexInList: -1
+    m_ScrollPosition: {x: 0, y: 0}
+    m_GridSize: 16
+  m_SkipHiddenPackages: 0
+  m_DirectoriesAreaWidth: 210
+--- !u!114 &19
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1494,15 +1580,15 @@ MonoBehaviour:
     x: 2086
     y: 0
     width: 474
-    height: 1299
+    height: 1307
   m_MinSize: {x: 276, y: 71}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 17}
+  m_ActualView: {fileID: 20}
   m_Panes:
-  - {fileID: 17}
+  - {fileID: 20}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &17
+--- !u!114 &20
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1525,11 +1611,11 @@ MonoBehaviour:
     x: 2086
     y: 73
     width: 473
-    height: 1278
+    height: 1286
   m_SerializedDataModeController:
-    m_DataMode: 0
-    m_PreferredDataMode: 0
-    m_SupportedDataModes: 
+    m_DataMode: 1
+    m_PreferredDataMode: 1
+    m_SupportedDataModes: 010000000200000003000000
     isAutomatic: 1
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:

XiuXianGame.sln.DotSettings.user

@@ -33,6 +33,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AList_00601_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9c2967a135e648bdb993c5397a44991b573620_003F5e_003F7396f990_003FList_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AList_00601_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003Fc2_003Ff2299255_003FList_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMathf_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003Fec_003F349cf977_003FMathf_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMathf_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003Fc7_003Fab5bc30c_003FMathf_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMath_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fb18a8b3398e74bca86895881dd02956c573648_003F8b_003F8699ce4e_003FMath_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMath_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003F0b_003F91e5e512_003FMath_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMesh_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003Fde_003Fb0e5d275_003FMesh_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>