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

# Conflicts:
#	Assets/Res/CombatScenes/LevelBattle03.prefab   resolved by master version

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0
+    - _Alpha: 0.42118084
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0
+    - _Alpha: 0.118317604
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

Assets/Res/Aduio/MainAudio.asset

@@ -275,69 +275,55 @@ MonoBehaviour:
   - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
     audionClipName: 9102_shifa2.wav
     volume: 1
-  AudioClips:
-  - {fileID: 8300000, guid: c9f9547d4305cc6409ea3347cbfac03f, type: 3}
-  - {fileID: 8300000, guid: 3650c793b36bec049be0e22040784775, type: 3}
-  - {fileID: 8300000, guid: 6a0389d19e064f74498d3ca891d55b4c, type: 3}
-  - {fileID: 8300000, guid: cd53b62009333504591524410c8689da, type: 3}
-  - {fileID: 8300000, guid: acf5b85e087dd5e4c8f9d4e7500eed82, type: 3}
-  - {fileID: 8300000, guid: 9538a3a5ec0d21c46b71a68ca7e63bbb, type: 3}
-  - {fileID: 8300000, guid: 42c7642fd30e35142be62ddedbe2689e, type: 3}
-  - {fileID: 8300000, guid: 9bd0dc0d548970a4a85bdb198c50cbb6, type: 3}
-  - {fileID: 8300000, guid: b57ff80856ac08a40b7b8e4074d5c9a1, type: 3}
-  - {fileID: 8300000, guid: 94408c3f2016a1c4d8d60cc1dc539fdd, type: 3}
-  - {fileID: 8300000, guid: bcd41dffeb9b30d47a001e5ee79998ab, type: 3}
-  - {fileID: 8300000, guid: 6423bfa272d1bf441b46d3f50e35bbff, type: 3}
-  - {fileID: 8300000, guid: 8e8deb59c557d16478c27ec2a0ac7fb5, type: 3}
-  - {fileID: 8300000, guid: d8f2a00dd46b6c14eb5b39ecff6522b5, type: 3}
-  - {fileID: 8300000, guid: 1516ed24b64ff5948a8779a94fdb6614, type: 3}
-  - {fileID: 8300000, guid: 14b87bf16e903bf48b933e4a65821624, type: 3}
-  - {fileID: 8300000, guid: 939800140ba53554c962da73e9458e99, type: 3}
-  - {fileID: 8300000, guid: e368096480221ab4a9fbf02eaeff8bcd, type: 3}
-  - {fileID: 8300000, guid: 353f1d3372347a24f9fa1fec6e657e5b, type: 3}
-  - {fileID: 8300000, guid: a6e9c16b9c72d9b4498f0ebc4e4720b4, type: 3}
-  - {fileID: 8300000, guid: 7867719b3bd0dfc468754860f3e9d1ba, type: 3}
-  - {fileID: 8300000, guid: 62a5eb87200cfc44baed79fb8073c9b9, type: 3}
-  - {fileID: 8300000, guid: 33df1eefc7e82e540a3cd9b69f2cbbb3, type: 3}
-  - {fileID: 8300000, guid: bcf6ba16dbd63e141a0481df8b33a9f1, type: 3}
-  - {fileID: 8300000, guid: 1375b46eb5ff33646a5d1f9dc7ef522f, type: 3}
-  - {fileID: 8300000, guid: 5c7399139f71fa742b8608ae5122aea1, type: 3}
-  - {fileID: 8300000, guid: 618ca714d2e3165499e7c484cacb0691, type: 3}
-  - {fileID: 8300000, guid: 62acbf10dc843044597bf8b61da4a286, type: 3}
-  - {fileID: 8300000, guid: 5ad2ab96fa03bb543864521e5b00e54d, type: 3}
-  - {fileID: 8300000, guid: eeacf752c41d983418c08937589df870, type: 3}
-  - {fileID: 8300000, guid: 3a85aa4c0a10b0846a6a547551d5cebd, type: 3}
-  - {fileID: 8300000, guid: 8f7591f8d2187334b95a8ee3cae94277, type: 3}
-  - {fileID: 8300000, guid: e4b92507c1b2e994b9d7adc11307ff2f, type: 3}
-  - {fileID: 8300000, guid: 75fa790f5fae9184891d197333b30bd9, type: 3}
-  - {fileID: 8300000, guid: 8e1f8c7b8b13f9d4e9f4b892161f65fa, type: 3}
-  - {fileID: 8300000, guid: 3369087d800c6dd478de6062f2145b34, type: 3}
-  - {fileID: 8300000, guid: 38e82475ae4867d4b8c05c24a5611f7d, type: 3}
-  - {fileID: 8300000, guid: 703f61a21633b4b42b203b8d18abdd0a, type: 3}
-  - {fileID: 8300000, guid: 169db9db1006f6c47bf69ae9f00c9f54, type: 3}
-  - {fileID: 8300000, guid: fe04c798d9e08394c9fbdae45416a970, type: 3}
-  - {fileID: 8300000, guid: 4f699fe96c0becb4f8ed7d50fe6cb80d, type: 3}
-  - {fileID: 8300000, guid: 2a1c302b3b0225241b2a98077bc9fb4c, type: 3}
-  - {fileID: 8300000, guid: 3ea3e5db60677d645a66d4a290f40643, type: 3}
-  - {fileID: 8300000, guid: 618f3ba353cb3b94f91b24d572a0ce44, type: 3}
-  - {fileID: 8300000, guid: b5caa44de7925354aaaf1f31101c525f, type: 3}
-  - {fileID: 8300000, guid: dd8e187f03a383e458871c93d58fa220, type: 3}
-  - {fileID: 8300000, guid: ef5c78084bd6d1e4e940063217d38a13, type: 3}
-  - {fileID: 8300000, guid: 890c54a3fd4750d40ac44e9ef8e4f033, type: 3}
-  - {fileID: 8300000, guid: c378b74a45ce90449b8c04bea2cde87c, type: 3}
-  - {fileID: 8300000, guid: 5624e01fab677e34fbbcb8a7a3969170, type: 3}
-  - {fileID: 8300000, guid: e9c30207a36a0f14492d1c3176a0ccf7, type: 3}
-  - {fileID: 8300000, guid: 5122ba1b585db4846814a1fe7a6871ab, type: 3}
-  - {fileID: 8300000, guid: 4a87ca2f651798447bd549c4fa392288, type: 3}
-  - {fileID: 8300000, guid: 9516f124a2dd294429ebf22a81ae0428, type: 3}
-  - {fileID: 8300000, guid: fe16e30243d152440b3855487918a5b6, type: 3}
-  - {fileID: 8300000, guid: 4ec8325700be95742b15e731743cfa99, type: 3}
-  - {fileID: 8300000, guid: 6753f88115e820a49bbfa0ecc027a0b6, type: 3}
-  - {fileID: 8300000, guid: 10ec998f3323fe64d96baeeb2c142e30, type: 3}
-  - {fileID: 8300000, guid: 7d0d13ead59288247be92922d9a1faee, type: 3}
-  - {fileID: 8300000, guid: 6e4156ec73d819e4a8e0236900bebfbc, type: 3}
-  - {fileID: 8300000, guid: 5a6908e1cd9fef74d92d860be71e6779, type: 3}
-  - {fileID: 8300000, guid: 63d8773218ee0374f9f09f4829f00849, type: 3}
-  - {fileID: 8300000, guid: dc6cdb952c673cb40aa5b7096e04672c, type: 3}
-  - {fileID: 8300000, guid: 6068f4e607032504ba7125f96f576bce, type: 3}
-  - {fileID: 8300000, guid: a8ead8e782f8d6f4aaa3bafa38ab9ec9, type: 3}
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: chuxian.wav
+    volume: 1
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: fabaochuxian.wav
+    volume: 1
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: fabaohit.wav
+    volume: 1
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: fb_10002gj.wav
+    volume: 1
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: fb_10003cixu.wav
+    volume: 1
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: fb_10004chuxian.wav
+    volume: 1
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: fb_10004hit.wav
+    volume: 1
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: fb_10007shengxiao.wav
+    volume: 1
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: fb_10008chixu.wav
+    volume: 1
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: fb_10008loop.wav
+    volume: 1
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: fb_10010chixu.wav
+    volume: 1
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: fb_10010chuxian.wav
+    volume: 1
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: fb_duiping.wav
+    volume: 1
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: fb_duipingbaozha.wav
+    volume: 1
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: fb_feixing.wav
+    volume: 1
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: fb_xiaopengzhuang.wav
+    volume: 1
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: ui_button.ogg
+    volume: 1
+  AudioClips: []

Assets/Res/Config/DropGroupConfig.json

@@ -135,175 +135,175 @@
     },
     {
       "ID": 20,
-      "dropRate": 1110,
+      "dropRate": 667,
       "dropItemID": [
         19
       ]
     },
     {
       "ID": 21,
-      "dropRate": 370,
+      "dropRate": 400,
       "dropItemID": [
         20
       ]
     },
     {
       "ID": 22,
-      "dropRate": 111,
+      "dropRate": 200,
       "dropItemID": [
         21
       ]
     },
     {
       "ID": 23,
-      "dropRate": 1110,
+      "dropRate": 667,
       "dropItemID": [
         22
       ]
     },
     {
       "ID": 24,
-      "dropRate": 370,
+      "dropRate": 400,
       "dropItemID": [
         23
       ]
     },
     {
       "ID": 25,
-      "dropRate": 111,
+      "dropRate": 200,
       "dropItemID": [
         24
       ]
     },
     {
       "ID": 26,
-      "dropRate": 618,
+      "dropRate": 1067,
       "dropItemID": [
         14
       ]
     },
     {
       "ID": 27,
-      "dropRate": 133,
+      "dropRate": 266,
       "dropItemID": [
         15
       ]
     },
     {
       "ID": 28,
-      "dropRate": 67,
+      "dropRate": 134,
       "dropItemID": [
         17
       ]
     },
     {
       "ID": 29,
-      "dropRate": 1110,
+      "dropRate": 667,
       "dropItemID": [
         19
       ]
     },
     {
       "ID": 30,
-      "dropRate": 370,
+      "dropRate": 400,
       "dropItemID": [
         20
       ]
     },
     {
       "ID": 31,
-      "dropRate": 111,
+      "dropRate": 200,
       "dropItemID": [
         21
       ]
     },
     {
       "ID": 32,
-      "dropRate": 1110,
+      "dropRate": 667,
       "dropItemID": [
         22
       ]
     },
     {
       "ID": 33,
-      "dropRate": 370,
+      "dropRate": 400,
       "dropItemID": [
         23
       ]
     },
     {
       "ID": 34,
-      "dropRate": 111,
+      "dropRate": 200,
       "dropItemID": [
         24
       ]
     },
     {
       "ID": 35,
-      "dropRate": 30,
+      "dropRate": 415,
       "dropItemID": [
         14
       ]
     },
     {
       "ID": 36,
-      "dropRate": 245,
+      "dropRate": 210,
       "dropItemID": [
         15
       ]
     },
     {
       "ID": 37,
-      "dropRate": 168,
+      "dropRate": 294,
       "dropItemID": [
         16
       ]
     },
     {
       "ID": 38,
-      "dropRate": 123,
+      "dropRate": 106,
       "dropItemID": [
         17
       ]
     },
     {
       "ID": 39,
-      "dropRate": 42,
+      "dropRate": 74,
       "dropItemID": [
         18
       ]
     },
     {
       "ID": 40,
-      "dropRate": 3212,
+      "dropRate": 2948,
       "dropItemID": [
         14
       ]
     },
     {
       "ID": 41,
-      "dropRate": 245,
+      "dropRate": 210,
       "dropItemID": [
         15
       ]
     },
     {
       "ID": 42,
-      "dropRate": 168,
+      "dropRate": 294,
       "dropItemID": [
         16
       ]
     },
     {
       "ID": 43,
-      "dropRate": 123,
+      "dropRate": 106,
       "dropItemID": [
         17
       ]
     },
     {
       "ID": 44,
-      "dropRate": 42,
+      "dropRate": 74,
       "dropItemID": [
         18
       ]

Assets/Res/Config/DropItemConfig.json

@@ -266,8 +266,8 @@
       "itemID": [
         1005
       ],
-      "dropMinV": 200,
-      "dropMaxV": 200,
+      "dropMinV": 300,
+      "dropMaxV": 300,
       "dropCountGoupID": -1
     },
     {
@@ -276,8 +276,8 @@
       "itemID": [
         1005
       ],
-      "dropMinV": 400,
-      "dropMaxV": 400,
+      "dropMinV": 600,
+      "dropMaxV": 600,
       "dropCountGoupID": -1
     },
     {
@@ -286,8 +286,8 @@
       "itemID": [
         1005
       ],
-      "dropMinV": 800,
-      "dropMaxV": 800,
+      "dropMinV": 1000,
+      "dropMaxV": 1000,
       "dropCountGoupID": -1
     },
     {
@@ -296,8 +296,8 @@
       "itemID": [
         1006
       ],
-      "dropMinV": 200,
-      "dropMaxV": 200,
+      "dropMinV": 300,
+      "dropMaxV": 300,
       "dropCountGoupID": -1
     },
     {
@@ -306,8 +306,8 @@
       "itemID": [
         1006
       ],
-      "dropMinV": 400,
-      "dropMaxV": 400,
+      "dropMinV": 600,
+      "dropMaxV": 600,
       "dropCountGoupID": -1
     },
     {
@@ -316,8 +316,8 @@
       "itemID": [
         1006
       ],
-      "dropMinV": 800,
-      "dropMaxV": 800,
+      "dropMinV": 1000,
+      "dropMaxV": 1000,
       "dropCountGoupID": -1
     },
     {

Assets/Res/Config/EventConfig.json

@@ -3487,7 +3487,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         600
       ],
       "RefreshProbability": 20,
@@ -3617,12 +3617,12 @@
       "EventQuality": 4,
       "PrizeIDs": [
         1502,
-        1601,
+        22008,
         1003
       ],
       "PrizeNums": [
         1,
-        3,
+        1,
         700
       ],
       "RefreshProbability": 20,
@@ -3758,7 +3758,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         650
       ],
       "RefreshProbability": 20,
@@ -3890,12 +3890,12 @@
       "EventQuality": 4,
       "PrizeIDs": [
         1502,
-        1601,
+        22008,
         1003
       ],
       "PrizeNums": [
         1,
-        3,
+        1,
         750
       ],
       "RefreshProbability": 20,
@@ -4017,7 +4017,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         700
       ],
       "RefreshProbability": 20,
@@ -4138,12 +4138,12 @@
       "EventQuality": 4,
       "PrizeIDs": [
         1502,
-        1601,
+        22008,
         1003
       ],
       "PrizeNums": [
         1,
-        3,
+        1,
         850
       ],
       "RefreshProbability": 20,
@@ -4269,7 +4269,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         2050
       ],
       "RefreshProbability": 20,
@@ -4387,12 +4387,12 @@
       "EventQuality": 4,
       "PrizeIDs": [
         1502,
-        1601,
+        22008,
         1003
       ],
       "PrizeNums": [
         1,
-        3,
+        1,
         2150
       ],
       "RefreshProbability": 20,
@@ -4512,7 +4512,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         1050
       ],
       "RefreshProbability": 20,
@@ -4628,12 +4628,12 @@
       "EventQuality": 4,
       "PrizeIDs": [
         1502,
-        1601,
+        22008,
         1003
       ],
       "PrizeNums": [
         1,
-        3,
+        1,
         1450
       ],
       "RefreshProbability": 20,
@@ -4754,7 +4754,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         1450
       ],
       "RefreshProbability": 20,
@@ -4833,12 +4833,12 @@
       "EventQuality": 4,
       "PrizeIDs": [
         1502,
-        1601,
+        22008,
         1003
       ],
       "PrizeNums": [
         1,
-        3,
+        1,
         1750
       ],
       "RefreshProbability": 20,
@@ -4885,12 +4885,10 @@
       "Score": 1,
       "EventQuality": 3,
       "PrizeIDs": [
-        22008,
         1001,
         1003
       ],
       "PrizeNums": [
-        1,
         5300,
         550
       ],
@@ -4927,12 +4925,10 @@
       "Score": 1,
       "EventQuality": 3,
       "PrizeIDs": [
-        22008,
         1001,
         1003
       ],
       "PrizeNums": [
-        1,
         5500,
         550
       ],
@@ -5014,12 +5010,10 @@
       "Score": 1,
       "EventQuality": 3,
       "PrizeIDs": [
-        22008,
         1001,
         1003
       ],
       "PrizeNums": [
-        1,
         6100,
         600
       ],
@@ -5200,12 +5194,10 @@
       "Score": 1,
       "EventQuality": 3,
       "PrizeIDs": [
-        22008,
         1001,
         1003
       ],
       "PrizeNums": [
-        1,
         5800,
         600
       ],
@@ -5488,12 +5480,10 @@
       "Score": 1,
       "EventQuality": 3,
       "PrizeIDs": [
-        22008,
         1001,
         1003
       ],
       "PrizeNums": [
-        1,
         6400,
         650
       ],
@@ -5655,12 +5645,10 @@
       "Score": 1,
       "EventQuality": 3,
       "PrizeIDs": [
-        22008,
         1001,
         1003
       ],
       "PrizeNums": [
-        1,
         7500,
         750
       ],
@@ -5707,10 +5695,12 @@
       "Score": 1,
       "EventQuality": 3,
       "PrizeIDs": [
+        22008,
         1001,
         1003
       ],
       "PrizeNums": [
+        1,
         8300,
         850
       ],
@@ -5749,12 +5739,10 @@
       "Score": 1,
       "EventQuality": 3,
       "PrizeIDs": [
-        22008,
         1001,
         1003
       ],
       "PrizeNums": [
-        1,
         7900,
         800
       ],
@@ -5932,12 +5920,10 @@
       "Score": 1,
       "EventQuality": 3,
       "PrizeIDs": [
-        22008,
         1001,
         1003
       ],
       "PrizeNums": [
-        1,
         9600,
         950
       ],
@@ -5973,10 +5959,12 @@
       "Score": 1,
       "EventQuality": 3,
       "PrizeIDs": [
+        22008,
         1001,
         1003
       ],
       "PrizeNums": [
+        1,
         10100,
         1000
       ],
@@ -6013,12 +6001,10 @@
       "Score": 1,
       "EventQuality": 3,
       "PrizeIDs": [
-        22008,
         1001,
         1003
       ],
       "PrizeNums": [
-        1,
         10600,
         1050
       ],
@@ -6485,7 +6471,7 @@
         103
       ],
       "EventTriggerType": 6,
-      "EventTag": 3,
+      "EventTag": 2,
       "EventType": 1,
       "Score": 0,
       "EventQuality": 2,
@@ -6526,7 +6512,7 @@
         103
       ],
       "EventTriggerType": 6,
-      "EventTag": 3,
+      "EventTag": 2,
       "EventType": 1,
       "Score": 0,
       "EventQuality": 2,
@@ -6568,7 +6554,7 @@
         103
       ],
       "EventTriggerType": 6,
-      "EventTag": 3,
+      "EventTag": 2,
       "EventType": 1,
       "Score": 0,
       "EventQuality": 2,
@@ -6649,7 +6635,7 @@
         103
       ],
       "EventTriggerType": 6,
-      "EventTag": 3,
+      "EventTag": 2,
       "EventType": 1,
       "Score": 0,
       "EventQuality": 2,
@@ -6694,7 +6680,7 @@
         103
       ],
       "EventTriggerType": 6,
-      "EventTag": 3,
+      "EventTag": 2,
       "EventType": 1,
       "Score": 0,
       "EventQuality": 2,
@@ -6743,7 +6729,7 @@
         103
       ],
       "EventTriggerType": 6,
-      "EventTag": 3,
+      "EventTag": 2,
       "EventType": 1,
       "Score": 0,
       "EventQuality": 2,
@@ -6787,12 +6773,12 @@
         103
       ],
       "EventTriggerType": 6,
-      "EventTag": 3,
+      "EventTag": 2,
       "EventType": 1,
       "Score": 0,
       "EventQuality": 2,
       "PrizeIDs": [
-        1403,
+        22008,
         1001,
         1003
       ],

Assets/Res/Config/PlayerGuideConfig.json

@@ -887,7 +887,7 @@
       "SpeakerImage": 3,
       "desc": 10416,
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -923,7 +923,7 @@
       "SpeakerImage": 3,
       "desc": -1,
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -959,7 +959,7 @@
       "SpeakerImage": 3,
       "desc": 10417,
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -979,8 +979,8 @@
       "groupID": 7,
       "FingerType": 1,
       "dialogPos": [
-        -182,
-        -517
+        -256,
+        200
       ],
       "NpcPos": [
         422,
@@ -995,7 +995,7 @@
       "SpeakerImage": 3,
       "desc": 10418,
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -1015,8 +1015,8 @@
       "groupID": 7,
       "FingerType": 1,
       "dialogPos": [
-        -182,
-        -517
+        -241,
+        -430
       ],
       "NpcPos": [
         422,
@@ -1031,7 +1031,7 @@
       "SpeakerImage": 3,
       "desc": 10419,
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -1065,9 +1065,9 @@
       "SpeakerName": 0,
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
-      "desc": 10420,
+      "desc": -1,
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -1088,7 +1088,7 @@
       "FingerType": 1,
       "dialogPos": [
         -182,
-        -517
+        200
       ],
       "NpcPos": [
         422,
@@ -1103,7 +1103,7 @@
       "SpeakerImage": 3,
       "desc": 10421,
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -1139,7 +1139,7 @@
       "SpeakerImage": 3,
       "desc": 10422,
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -1175,7 +1175,7 @@
       "SpeakerImage": 3,
       "desc": 10423,
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -1217,7 +1217,7 @@
       "AwardItemNum": [
         300
       ],
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.7,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -1253,7 +1253,7 @@
       "SpeakerImage": 3,
       "desc": -1,
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.7,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -1289,7 +1289,7 @@
       "SpeakerImage": 3,
       "desc": 10425,
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.7,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -1325,7 +1325,7 @@
       "SpeakerImage": 3,
       "desc": 10448,
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.7,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -1345,8 +1345,8 @@
       "groupID": 9,
       "FingerType": 1,
       "dialogPos": [
-        -182,
-        -517
+        -83,
+        83
       ],
       "NpcPos": [
         422,
@@ -1361,7 +1361,7 @@
       "SpeakerImage": 3,
       "desc": 10449,
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.7,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [

Assets/Res/Config/SkillConstant.json

@@ -3,21 +3,21 @@
     {
       "ID": 3,
       "SkillPromoteNeedPieceNum": [
-        3,
-        6,
         9,
-        15,
-        24
+        18,
+        30,
+        45,
+        60
       ]
     },
     {
       "ID": 4,
       "SkillPromoteNeedPieceNum": [
-        10,
-        10,
         20,
         20,
-        30
+        30,
+        40,
+        50
       ]
     },
     {

Assets/Res/UI/BoxPanel/OpenBoxScorePanel.prefab

@@ -19,7 +19,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &8133080571240593798
 RectTransform:
   m_ObjectHideFlags: 0
@@ -445,10 +445,10 @@ RectTransform:
   - {fileID: 5428019602683763515}
   m_Father: {fileID: 7858018693182147813}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -288.98627}
-  m_SizeDelta: {x: 646.872, y: 616.7927}
+  m_AnchorMin: {x: 0.5, y: 0.13338424}
+  m_AnchorMax: {x: 0.5, y: 0.51084733}
+  m_AnchoredPosition: {x: 0, y: 1.0136719}
+  m_SizeDelta: {x: 646.872, y: 0.7927246}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2564010822953909151
 CanvasRenderer:
@@ -538,8 +538,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -0.5809, y: -57.711}
-  m_SizeDelta: {x: 625.863, y: 424.8}
+  m_AnchoredPosition: {x: -0.5809021, y: -57.711}
+  m_SizeDelta: {x: 625.863, y: 320.8}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6748753096610578173
 CanvasRenderer:
@@ -643,10 +643,10 @@ RectTransform:
   - {fileID: 7237139809221645204}
   m_Father: {fileID: 5366739683216167502}
   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: 11.418977, y: 306.4947}
-  m_SizeDelta: {x: 228.0359, y: 55.1832}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 11.418977, y: -0.50531006}
+  m_SizeDelta: {x: 228.0359, y: 55.183197}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5341967818580382441
 CanvasRenderer:
@@ -828,10 +828,10 @@ RectTransform:
   - {fileID: 7883065359111312998}
   m_Father: {fileID: 5366739683216167502}
   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: 5.1745, y: -6.6163}
-  m_SizeDelta: {x: 633.25, y: 565.8463}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 5.1744995, y: -6.6163025}
+  m_SizeDelta: {x: -12.75, y: -48.153687}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1299575708875599391
 CanvasRenderer:
@@ -934,10 +934,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 5366739683216167502}
   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_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 643.5944, y: 613.34}
+  m_SizeDelta: {x: -2.4055786, y: -0.65997314}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5592096566782003340
 CanvasRenderer:
@@ -1389,10 +1389,10 @@ RectTransform:
   - {fileID: 7331267903340754230}
   m_Father: {fileID: 7858018693182147813}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 331.11133}
-  m_SizeDelta: {x: 644.9078, y: 566.3665}
+  m_AnchorMin: {x: 0.5, y: 0.5271527}
+  m_AnchorMax: {x: 0.5, y: 0.87500006}
+  m_AnchoredPosition: {x: 0, y: 2.1113281}
+  m_SizeDelta: {x: 644.9078, y: -1.6334839}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6858452839668547294
 CanvasRenderer:
@@ -2087,10 +2087,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 3787544951613840147}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.0913, y: 2.5078}
-  m_SizeDelta: {x: 624.514, y: 545.241}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0.091308594, y: 2.5078125}
+  m_SizeDelta: {x: -19.486023, y: -18.758972}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8574758566871946628
 CanvasRenderer:

Assets/Res/UI/CombatPanel.prefab

@@ -750,7 +750,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -32, y: -25}
+  m_AnchoredPosition: {x: -34.999977, y: -25}
   m_SizeDelta: {x: 58, y: 61}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7340582039138565285
@@ -1577,7 +1577,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -32, y: -25}
+  m_AnchoredPosition: {x: -34.999977, y: -25}
   m_SizeDelta: {x: 68, y: 68}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4675657056430347178
@@ -1755,7 +1755,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 85.8, y: -20.1}
+  m_AnchoredPosition: {x: 108.59999, y: -20.1}
   m_SizeDelta: {x: 227.39, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7094924967954254907
@@ -4458,7 +4458,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 81.7, y: -20.4}
+  m_AnchoredPosition: {x: 104.499985, y: -20.4}
   m_SizeDelta: {x: 234.7, y: 24.8}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8200075529076420752
@@ -4636,7 +4636,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -32, y: -25}
+  m_AnchoredPosition: {x: -35, y: -25}
   m_SizeDelta: {x: 95, y: 95}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8212043821379529070
@@ -6497,7 +6497,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -32, y: -25}
+  m_AnchoredPosition: {x: -34.999977, y: -25}
   m_SizeDelta: {x: 75, y: 75}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4122648181825630809
@@ -6800,7 +6800,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -59, y: 31}
+  m_AnchoredPosition: {x: -52.100006, y: 36}
   m_SizeDelta: {x: 84, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4199138803469849610
@@ -6978,7 +6978,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 149.21, y: 17.7}
+  m_AnchoredPosition: {x: 172.01, y: 17.7}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &6266451616475677771
@@ -7433,7 +7433,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -59, y: 31}
+  m_AnchoredPosition: {x: -52.100014, y: 36}
   m_SizeDelta: {x: 68, y: 68}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4963023395715097639
@@ -7678,7 +7678,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -62.4, y: 32.1}
+  m_AnchoredPosition: {x: -55.500008, y: 37.1}
   m_SizeDelta: {x: 50, y: 65}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2407304736381725406
@@ -8128,7 +8128,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -14.9, y: 29}
+  m_AnchoredPosition: {x: 7.899988, y: 29}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1601245502264627568
@@ -9300,7 +9300,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -50, y: 4.98}
+  m_AnchoredPosition: {x: -27.2, y: 4.98}
   m_SizeDelta: {x: 250, y: 15}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &6934183408135190191

Assets/Res/UI/DivineSence/BossInfoPanel.prefab

@@ -1253,8 +1253,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -32.4, y: 3.6}
-  m_SizeDelta: {x: 349.5654, y: 90.0548}
+  m_AnchoredPosition: {x: 44.569878, y: 3.6}
+  m_SizeDelta: {x: 504.1384, y: 90.0548}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5752223019001905554
 CanvasRenderer:
@@ -2837,8 +2837,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -5.9401, y: 0.00011063}
-  m_SizeDelta: {x: 405.25, y: 107.3}
+  m_AnchoredPosition: {x: 43.5041, y: 0.00011063}
+  m_SizeDelta: {x: 504.1384, y: 107.3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7447028169586020602
 CanvasRenderer:

Assets/Res/UI/DivineSence/DivineSenceEventPreviewPanel.prefab

@@ -337,7 +337,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 2.6099854, y: -8.905579}
+  m_AnchoredPosition: {x: 2.6099854, y: -8.905518}
   m_SizeDelta: {x: 718.82, y: -416.07}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &233757076051763532
@@ -459,7 +459,7 @@ RectTransform:
   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: 750, y: 1624}
+  m_SizeDelta: {x: 1500, y: 3248}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &7897761964867798499
 MonoBehaviour:
@@ -554,6 +554,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: DivineSenceHuoQuWidgetGam
+    gameObject: {fileID: 1052098454278746621}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &1245667844451503244
 GameObject:
@@ -1000,8 +1005,8 @@ MonoBehaviour:
   Page: {x: 1, y: 1}
   bottom: 0
   wdiget: {fileID: 0}
-  sizeData: {x: 683, y: 282}
-  isCustomizeHeight: 0
+  sizeData: {x: 683, y: 25}
+  isCustomizeHeight: 1
   posOff: {x: 13, y: 0}
   isDelay: 0
   delayTime: 0
@@ -1671,8 +1676,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0.000030517578}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 5.94, y: 0}
+  m_SizeDelta: {x: -11.88, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5904849993517078433
 CanvasRenderer:
@@ -2183,6 +2188,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3581464887972855309}
+  - {fileID: 1445572438664158512}
   m_Father: {fileID: 8599819629026832582}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
@@ -3161,6 +3167,117 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ShowMaskGraphic: 0
+--- !u!1001 &4381551719312464617
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 4419547383971070637}
+    m_Modifications:
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 253
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 80
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3627557051994647316, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_Name
+      value: DivineSenceHuoQuWidget
+      objectReference: {fileID: 0}
+    - target: {fileID: 3627557051994647316, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+--- !u!1 &1052098454278746621 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3627557051994647316, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+  m_PrefabInstance: {fileID: 4381551719312464617}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &1445572438664158512 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+  m_PrefabInstance: {fileID: 4381551719312464617}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &6181054649854434105
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Res/UI/DivineSence/DivineSenceHuoQuWidget.prefab

@@ -0,0 +1,218 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &3627557051994647316
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2936859786160048089}
+  - component: {fileID: 3158301123575424926}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: DivineSenceHuoQuWidget
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2936859786160048089
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3627557051994647316}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8633998077493613913}
+  - {fileID: 7295177279328845725}
+  m_Father: {fileID: 0}
+  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: -66, y: -136}
+  m_SizeDelta: {x: 684, y: 80}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3158301123575424926
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3627557051994647316}
+  m_CullTransparentMesh: 1
+--- !u!1 &6407854385143611286
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8633998077493613913}
+  - component: {fileID: 151687995553922551}
+  - component: {fileID: 4965095530726692492}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: DivineSenceHuoQuWidget
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8633998077493613913
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6407854385143611286}
+  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: 2936859786160048089}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 253, y: 80}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &151687995553922551
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6407854385143611286}
+  m_CullTransparentMesh: 1
+--- !u!114 &4965095530726692492
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6407854385143611286}
+  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: btn_shengji
+  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: e09f56329289dea619e61cb78606497c
+  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 &8022387299475652960
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7295177279328845725}
+  - component: {fileID: 3811028064332339952}
+  - component: {fileID: 5345756085271467585}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy) (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7295177279328845725
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8022387299475652960}
+  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: 2936859786160048089}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3811028064332339952
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8022387299475652960}
+  m_CullTransparentMesh: 1
+--- !u!114 &5345756085271467585
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8022387299475652960}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 39
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u83B7\u53D6\u66F4\u591A"

Assets/Res/UI/DivineSence/DivineSenceHuoQuWidget.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: BilMvSKvUnwNOXa5pJer2i9eLGAC6jRM038Ebe4ewDkBkLujGb02Vxn5IK8k
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/DivineSence/DivineSenceRestoredWidget.prefab

@@ -222,7 +222,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 189.53296, y: -49.37755}
-  m_SizeDelta: {x: 0, y: 96.45}
+  m_SizeDelta: {x: 108, y: 96.45}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5304083428607473890
 CanvasRenderer:

Assets/Res/UI/DivineSence/GongFaWidgetType2.prefab

@@ -1,5 +1,94 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &498122000546911970
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6916979475307095600}
+  - component: {fileID: 3098553881310741778}
+  - component: {fileID: 4314374589381719289}
+  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 &6916979475307095600
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 498122000546911970}
+  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: 3154258649401657841}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 38, y: 36}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &3098553881310741778
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 498122000546911970}
+  m_CullTransparentMesh: 1
+--- !u!114 &4314374589381719289
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 498122000546911970}
+  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_gfxingji
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  packInfo:
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 36
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &1671693449042742178
 GameObject:
   m_ObjectHideFlags: 0
@@ -35,8 +124,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: -0.0009498596, y: -29.9}
-  m_SizeDelta: {x: 68.466, y: 30}
+  m_AnchoredPosition: {x: 0.0000026226, y: -29.9}
+  m_SizeDelta: {x: 80, y: 31.1973}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &1237620596013164419
 CanvasRenderer:
@@ -59,7 +148,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -68,7 +157,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 20
+    m_FontSize: 24
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -80,6 +169,273 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "1\u7EA7"
+--- !u!1 &1916139475447988823
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2500376018970374053}
+  - component: {fileID: 9106823823273572709}
+  - component: {fileID: 5779671277336139395}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (5)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2500376018970374053
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1916139475447988823}
+  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: 3154258649401657841}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 38, y: 36}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &9106823823273572709
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1916139475447988823}
+  m_CullTransparentMesh: 1
+--- !u!114 &5779671277336139395
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1916139475447988823}
+  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_gfxingji
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  packInfo:
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 36
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &2471961167470248917
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 216267843454775406}
+  - component: {fileID: 7113338127107576254}
+  - component: {fileID: 2940579089653344557}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (3)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &216267843454775406
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2471961167470248917}
+  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: 3154258649401657841}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 38, y: 36}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &7113338127107576254
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2471961167470248917}
+  m_CullTransparentMesh: 1
+--- !u!114 &2940579089653344557
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2471961167470248917}
+  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_gfxingji
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  packInfo:
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 36
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &3858005826730162093
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2115646262538371135}
+  - component: {fileID: 7640830385333969459}
+  - component: {fileID: 6141892540767857241}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2115646262538371135
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3858005826730162093}
+  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: 3154258649401657841}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 38, y: 36}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &7640830385333969459
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3858005826730162093}
+  m_CullTransparentMesh: 1
+--- !u!114 &6141892540767857241
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3858005826730162093}
+  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_gfxingji
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  packInfo:
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 36
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &3946302300112563901
 GameObject:
   m_ObjectHideFlags: 0
@@ -203,6 +559,7 @@ RectTransform:
   - {fileID: 4458728715945139816}
   - {fileID: 5381176108441561872}
   - {fileID: 3608208511281012576}
+  - {fileID: 3154258649401657841}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -246,6 +603,16 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: StarRoot
+    gameObject: {fileID: 8983252782158562355}
+    isAssetBundle: 0
+    isList: 1
+    ListCollectorDatas:
+    - gameObject: {fileID: 498122000546911970}
+    - gameObject: {fileID: 3858005826730162093}
+    - gameObject: {fileID: 2471961167470248917}
+    - gameObject: {fileID: 8604186990887004553}
+    - gameObject: {fileID: 1916139475447988823}
   isAssetBundle: 1
 --- !u!1 &7146904648124061661
 GameObject:
@@ -265,7 +632,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &5381176108441561872
 RectTransform:
   m_ObjectHideFlags: 0
@@ -426,3 +793,184 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &8604186990887004553
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7245220674678169516}
+  - component: {fileID: 3417995764051712588}
+  - component: {fileID: 5012569221925056839}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (4)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7245220674678169516
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8604186990887004553}
+  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: 3154258649401657841}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 38, y: 36}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &3417995764051712588
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8604186990887004553}
+  m_CullTransparentMesh: 1
+--- !u!114 &5012569221925056839
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8604186990887004553}
+  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_gfxingji
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  packInfo:
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 36
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &8983252782158562355
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3154258649401657841}
+  - component: {fileID: 4372224768594358457}
+  - component: {fileID: 615741272539858957}
+  - component: {fileID: 1812978112319568024}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: StarRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3154258649401657841
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8983252782158562355}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.4, y: 0.4, z: 0.4}
+  m_ConstrainProportionsScale: 1
+  m_Children:
+  - {fileID: 6916979475307095600}
+  - {fileID: 2115646262538371135}
+  - {fileID: 216267843454775406}
+  - {fileID: 7245220674678169516}
+  - {fileID: 2500376018970374053}
+  m_Father: {fileID: 3138042374053727249}
+  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.7, y: -38.7}
+  m_SizeDelta: {x: 0, y: 30.610802}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &4372224768594358457
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8983252782158562355}
+  m_CullTransparentMesh: 1
+--- !u!114 &615741272539858957
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8983252782158562355}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!114 &1812978112319568024
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8983252782158562355}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0

Assets/Res/UI/DivineSence/主界面-神识-神识恢复弹窗.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: XX5N5yKsW34vJwuZBPso/zkrfCz2+6cCh5dTYfU/gB7yrG5Gd0thYhhIS34w
-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: 0
-  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: "\u4E3B\u754C\u9762-\u795E\u8BC6-\u795E\u8BC6\u6062\u590D\u5F39\u7A97"
-  assetBundleVariant: 

Assets/Res/UI/DivineSence/战斗界面-战前信息1.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: BygcvSj/BimU6Clmp/JP+2gIDDm5vdqV3dwBE4ufjvUHDMObVyytFbMrHIG9
-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: 0
-  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: "\u6218\u6597\u754C\u9762-\u6218\u524D\u4FE1\u606F1"
-  assetBundleVariant: 

Assets/Res/UI/DivineSence/战斗界面-战前详情.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: WS4Y4H+uBn13DxP08NQQ/j8xB5t4CGNGGsZH+HmDTl7baK5qbfvCR1c8wAXs
-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: 0
-  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: "\u6218\u6597\u754C\u9762-\u6218\u524D\u8BE6\u60C5"
-  assetBundleVariant: 

Assets/Res/UI/LevelChoosePanel/PlacesInfoPanel.prefab

@@ -1042,7 +1042,6 @@ RectTransform:
   - {fileID: 3448986095428033778}
   - {fileID: 6705522348014208234}
   - {fileID: 3904336313667662518}
-  - {fileID: 2266508853877018442}
   - {fileID: 3035646753122329493}
   - {fileID: 7892632760807934045}
   - {fileID: 5693100649297059383}
@@ -1285,6 +1284,7 @@ GameObject:
   - component: {fileID: 3904336313667662518}
   - component: {fileID: 5325227394525925118}
   - component: {fileID: 2297732390318598695}
+  - component: {fileID: 1663606713194946654}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_PlacesName
@@ -1304,14 +1304,15 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 2266508853877018442}
   m_Father: {fileID: 4534880848114758260}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -203.78177, y: 221.8}
-  m_SizeDelta: {x: -507.6071, y: -798.3508}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 39.4, y: 217.5}
+  m_SizeDelta: {x: 0, y: 61.64917}
+  m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &5325227394525925118
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1353,7 +1354,21 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5317\u6D77"
+  m_Text: "\u5317\u6D77\u6D77"
+--- !u!114 &1663606713194946654
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7375659200628869323}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &7911065620788399886
 GameObject:
   m_ObjectHideFlags: 0
@@ -1683,6 +1698,7 @@ GameObject:
   - component: {fileID: 2266508853877018442}
   - component: {fileID: 3013501019931846197}
   - component: {fileID: 2456649883462433114}
+  - component: {fileID: 2770893818892637768}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_PlacesComplteProgress
@@ -1703,13 +1719,13 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 4534880848114758260}
+  m_Father: {fileID: 3904336313667662518}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -75.2, y: 216.5}
-  m_SizeDelta: {x: -442.781, y: -823.39984}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: 166.4, y: 0}
+  m_SizeDelta: {x: 163, y: 36.180115}
+  m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &3013501019931846197
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1752,6 +1768,26 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u63A2\u7D22\u5EA6:0%"
+--- !u!114 &2770893818892637768
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8661358576281957541}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 1
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
 --- !u!1 &8994874510214016950
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/MainHeroPanel/SelectFaBaoPanel.prefab

@@ -4834,7 +4834,7 @@ RectTransform:
   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: 750, y: 1334}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

Assets/Scenes/testCombat.scene

@@ -504,6 +504,221 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!213 &333746269
+Sprite:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: dec_jianbian_tiao(Clone)
+  m_Rect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 115
+    height: 33
+  m_Offset: {x: 0, y: 0}
+  m_Border: {x: 0, y: 0, z: 0, w: 0}
+  m_PixelsToUnits: 100
+  m_Pivot: {x: 0.5, y: 0.5}
+  m_Extrude: 1
+  m_IsPolygon: 0
+  m_AtlasName: 
+  m_PackingTag: 
+  m_RenderDataKey:
+    c0c46614f24bc234b92e828eae8336c3: 21300000
+  m_AtlasTags:
+  - tongyong
+  m_SpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  m_RD:
+    serializedVersion: 3
+    texture: {fileID: 2800000, guid: c0c46614f24bc234b92e828eae8336c3, type: 3}
+    alphaTexture: {fileID: 0}
+    secondaryTextures: []
+    m_SubMeshes:
+    - serializedVersion: 2
+      firstByte: 0
+      indexCount: 6
+      topology: 0
+      baseVertex: 0
+      firstVertex: 0
+      vertexCount: 4
+      localAABB:
+        m_Center: {x: 0, y: 0, z: 0}
+        m_Extent: {x: 0, y: 0, z: 0}
+    m_IndexBuffer: 030000000100020001000000
+    m_VertexData:
+      serializedVersion: 3
+      m_VertexCount: 4
+      m_Channels:
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 3
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 1
+        offset: 0
+        format: 0
+        dimension: 2
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      m_DataSize: 80
+      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
+    m_Bindpose: []
+    textureRect:
+      serializedVersion: 2
+      x: 0
+      y: 0
+      width: 115
+      height: 33
+    textureRectOffset: {x: 0, y: 0}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 57.5, z: 100, w: 16.5}
+    downscaleMultiplier: 1
+  m_AtlasRD:
+    serializedVersion: 3
+    texture: {fileID: 8711939763936270973, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+    alphaTexture: {fileID: 0}
+    secondaryTextures: []
+    m_SubMeshes:
+    - serializedVersion: 2
+      firstByte: 0
+      indexCount: 6
+      topology: 0
+      baseVertex: 0
+      firstVertex: 0
+      vertexCount: 4
+      localAABB:
+        m_Center: {x: 0, y: 0, z: 0}
+        m_Extent: {x: 0, y: 0, z: 0}
+    m_IndexBuffer: 030000000100020001000000
+    m_VertexData:
+      serializedVersion: 3
+      m_VertexCount: 4
+      m_Channels:
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 3
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 1
+        offset: 0
+        format: 0
+        dimension: 2
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      m_DataSize: 80
+      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
+    m_Bindpose: []
+    textureRect:
+      serializedVersion: 2
+      x: 389
+      y: 1229
+      width: 115
+      height: 33
+    textureRectOffset: {x: 0, y: 0}
+    atlasRectOffset: {x: 389, y: 1229}
+    settingsRaw: 67
+    uvTransform: {x: 100, y: 446.5, z: 100, w: 1245.5}
+    downscaleMultiplier: 1
+  m_PhysicsShape:
+  - - {x: 0.345, y: 0.16499999}
+    - {x: 0.345, y: -0.16499999}
+    - {x: 0.575, y: -0.16499999}
+    - {x: 0.575, y: 0.16499999}
+  m_Bones: []
+  m_SpriteID: 5e97eb03825dee720800000000000000
 --- !u!1 &376281604
 GameObject:
   m_ObjectHideFlags: 0
@@ -1256,221 +1471,6 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
---- !u!213 &1787246934
-Sprite:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: dec_jianbian_tiao(Clone)
-  m_Rect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 115
-    height: 33
-  m_Offset: {x: 0, y: 0}
-  m_Border: {x: 0, y: 0, z: 0, w: 0}
-  m_PixelsToUnits: 100
-  m_Pivot: {x: 0.5, y: 0.5}
-  m_Extrude: 1
-  m_IsPolygon: 0
-  m_AtlasName: 
-  m_PackingTag: 
-  m_RenderDataKey:
-    c0c46614f24bc234b92e828eae8336c3: 21300000
-  m_AtlasTags:
-  - tongyong
-  m_SpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
-  m_RD:
-    serializedVersion: 3
-    texture: {fileID: 2800000, guid: c0c46614f24bc234b92e828eae8336c3, type: 3}
-    alphaTexture: {fileID: 0}
-    secondaryTextures: []
-    m_SubMeshes:
-    - serializedVersion: 2
-      firstByte: 0
-      indexCount: 6
-      topology: 0
-      baseVertex: 0
-      firstVertex: 0
-      vertexCount: 4
-      localAABB:
-        m_Center: {x: 0, y: 0, z: 0}
-        m_Extent: {x: 0, y: 0, z: 0}
-    m_IndexBuffer: 030000000100020001000000
-    m_VertexData:
-      serializedVersion: 3
-      m_VertexCount: 4
-      m_Channels:
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 3
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 1
-        offset: 0
-        format: 0
-        dimension: 2
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      m_DataSize: 80
-      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
-    m_Bindpose: []
-    textureRect:
-      serializedVersion: 2
-      x: 0
-      y: 0
-      width: 115
-      height: 33
-    textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: -1, y: -1}
-    settingsRaw: 64
-    uvTransform: {x: 100, y: 57.5, z: 100, w: 16.5}
-    downscaleMultiplier: 1
-  m_AtlasRD:
-    serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
-    alphaTexture: {fileID: 0}
-    secondaryTextures: []
-    m_SubMeshes:
-    - serializedVersion: 2
-      firstByte: 0
-      indexCount: 6
-      topology: 0
-      baseVertex: 0
-      firstVertex: 0
-      vertexCount: 4
-      localAABB:
-        m_Center: {x: 0, y: 0, z: 0}
-        m_Extent: {x: 0, y: 0, z: 0}
-    m_IndexBuffer: 030000000100020001000000
-    m_VertexData:
-      serializedVersion: 3
-      m_VertexCount: 4
-      m_Channels:
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 3
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 1
-        offset: 0
-        format: 0
-        dimension: 2
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      m_DataSize: 80
-      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
-    m_Bindpose: []
-    textureRect:
-      serializedVersion: 2
-      x: 389
-      y: 1229
-      width: 115
-      height: 33
-    textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 389, y: 1229}
-    settingsRaw: 67
-    uvTransform: {x: 100, y: 446.5, z: 100, w: 1245.5}
-    downscaleMultiplier: 1
-  m_PhysicsShape:
-  - - {x: 0.345, y: 0.16499999}
-    - {x: 0.345, y: -0.16499999}
-    - {x: 0.575, y: -0.16499999}
-    - {x: 0.575, y: 0.16499999}
-  m_Bones: []
-  m_SpriteID: 5e97eb03825dee720800000000000000
 --- !u!1 &1831378551
 GameObject:
   m_ObjectHideFlags: 0
@@ -1529,7 +1529,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 1787246934}
+  m_Sprite: {fileID: 333746269}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/Scripts/Core/Audio/AudionSettingConfig.cs

@@ -28,6 +28,21 @@ namespace Core.Audio
                 string path = AssetDatabase.GetAssetPath(AudioClips[i]);
                 string allApth = Application.dataPath.Replace("Assets", "") + path;
                 string name = System.IO.Path.GetFileName(allApth);
+                bool isExist = false;
+                for (int j = 0; j < configs.Count; j++)
+                {
+                    if (name.Equals(configs[i].audionClipName))
+                    {
+                        isExist = true;
+                        break;
+                    }
+                }
+
+                if (isExist)
+                {
+                    continue;
+                }
+
                 configs.Add(new AudionConfig() { audionClipName = name });
             }
         }

Assets/Scripts/GameLogic/Bag/BagController.cs

@@ -242,7 +242,9 @@ namespace GameLogic.Bag
                 return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[1]);
             }
 
+
             item.count += count;
+      
 
             EventManager.Instance.Dispatch(CustomEventType.ItemUpdate,
                 new ItemUpdateData() { ItemInfo = item, Count = (int)count });
@@ -250,6 +252,17 @@ namespace GameLogic.Bag
                 new ItemUpdateData() { ItemInfo = item, Count = (int)count });
             AccountFileInfo.Instance.SaveItemData(item);
             RedDotManager.Instance.AllRedDotUpDate();
+            
+            
+            //合成免广告道具
+            if (item.config.associateID == 10)
+            {
+                if (item.count >= item.config.associateVlaue[0])
+                {
+                    AddItem(item.config.associateVlaue[1], 1);
+                }
+            }
+            
             return true;
         }
 

Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneCJ2MonoConfig.cs

@@ -82,7 +82,7 @@ namespace GameLogic.Combat.CombatTool.SceneTool
                     float currX = (xStartInit + i) * radius;
                     float currZ = (zStartInit + j) * radius;
                     int key = (int)(currX * 1000 + currZ);
-                    InitUp(key, currX, currZ);
+                    // InitUp(key, currX, currZ);
                     InitDown(key, currX, currZ, i, j);
                 }
             }

Assets/Scripts/GameLogic/Combat/Hero/Turntable/SkillTurntable.cs

@@ -219,11 +219,7 @@ namespace GameLogic.Combat.Hero.Turntable
                 return;
             }
 
-            b_1025 b1025 = CombatHeroEntity.BuffControl.GetBuffBasicForType<b_1025>();
-            if (b1025 != null)
-            {
-                return;
-            }
+         
 
 
             if (!_combatHeroEntity.IsCantAddGongFa())
@@ -263,7 +259,11 @@ namespace GameLogic.Combat.Hero.Turntable
                     _removeSkillBasic.Clear();
                 }
             }
-
+            b_1025 b1025 = CombatHeroEntity.BuffControl.GetBuffBasicForType<b_1025>();
+            if (b1025 != null)
+            {
+                return;
+            }
             if (!isStop)
             {
                 for (int i = 0; i < allSkillSlots.Count; i++)

Assets/Scripts/GameStart/GameStart.cs

@@ -21,6 +21,7 @@ public class GameStart : MonoBehaviour
     [ContextMenu("asdada")]
     public void Test()
     {
+        
     }
 
     [ObfuzIgnore]

Assets/Scripts/GameUI/UI/BoxPanel/GachaPanel.cs

@@ -43,6 +43,7 @@ namespace Fort23.Mono
             {
                 PlayerGuideManager.Instance.NextGuide();
             }
+
             // TitlePanel.OpenPanel(new List<int>() { GlobalParam.Item_Coin_ID, GlobalParam.Item_Diamond_ID });
             return base.GetFocus();
         }
@@ -66,18 +67,22 @@ namespace Fort23.Mono
             tenButton.onClick.AddListener(async () =>
             {
 #if UNITY_ANDROID && !UNITY_EDITOR&& Taptap
-                      if (TakuSDKManager.Instance.IsReady())
+                if (!PlayerManager.Instance.BagController.IsEnough(23001, 1))
                 {
-                    bool isOK = await TakuSDKManager.Instance.ShowAutoAd();
-                    if (!isOK)
+                    if (TakuSDKManager.Instance.IsReady())
+                    {
+                        bool isOK = await TakuSDKManager.Instance.ShowAutoAd();
+                        if (!isOK)
+                        {
+                            return;
+                        }
+                    }
+                    else
                     {
                         return;
                     }
                 }
-                else
-                {
-                    return;
-                }
+
 #endif
 
                 tenButton.gameObject.SetActive(false);
@@ -193,7 +198,6 @@ namespace Fort23.Mono
 
             await MarskPanel.ClosePanel();
             root.gameObject.SetActive(true);
-
         }
 
 

Assets/Scripts/GameUI/UI/BoxPanel/OpenBoxScorePanel.cs

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
+using GameLogic.Bag;
 using GameLogic.Player;
 
 namespace Fort23.Mono
@@ -66,7 +67,7 @@ namespace Fort23.Mono
                     $"当前进度：{summonData.drawHistory.Count * 10}/{openBoxConfig.ProgressRewardChoukaCount}";
                 Text_Score.text = $"目前得分：{summonData.score}";
             }
-            
+
             using (CTaskAwaitBuffer cts =
                    new CTaskAwaitBuffer())
             {
@@ -137,6 +138,7 @@ namespace Fort23.Mono
 
         private void AwardSummonScore()
         {
+            List<ItemInfo> itemInfos = new List<ItemInfo>();
             //到达进度自动领取奖励
             if (openBoxConfig.ProgressRewardChoukaCount != -1 &&
                 summonData.drawHistory.Count * 10 >= openBoxConfig.ProgressRewardChoukaCount)
@@ -147,8 +149,8 @@ namespace Fort23.Mono
                     {
                         for (var i1 = 0; i1 < openBoxProgressRewards[i].PrizeID.Length; i1++)
                         {
-                            PlayerManager.Instance.BagController.AddItem(openBoxProgressRewards[i].PrizeID[i1],
-                                openBoxProgressRewards[i].PrizeCount[i1]);
+                            itemInfos.Add(new ItemInfo(openBoxProgressRewards[i].PrizeID[i1],
+                                openBoxProgressRewards[i].PrizeCount[i1]));
                         }
 
                         break;
@@ -163,8 +165,10 @@ namespace Fort23.Mono
                 {
                     summonSocreData.currentCount = 0;
                 }
-                // summonData.summonSocreData.Clear();
+
+                PlayerManager.Instance.BagController.AddItem(itemInfos);
                 AccountFileInfo.Instance.SavePlayerData();
+                RewardsPanel.OpenPanel(itemInfos);
             }
             else
             {

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventPreviewPanel.cs

@@ -3,6 +3,7 @@ using Core.Language;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
+using Mono.Utility;
 using UnityEngine;
 
 namespace Fort23.Mono
@@ -12,7 +13,7 @@ namespace Fort23.Mono
     {
         public List<AccountFileInfo.EventList> showEventList = new List<AccountFileInfo.EventList>();
 
-        List<ShengShiEventWidgetType2> shengShiEventWidgetTypeList = new List<ShengShiEventWidgetType2>();
+        List<UIComponent> shengShiEventWidgetTypeList = new List<UIComponent>();
 
         public ShengShiEventWidgetType2 mainShengShiEventWidgetType2;
 
@@ -20,6 +21,8 @@ namespace Fort23.Mono
 
         bool isTriggerEvent = false;
 
+        private int creatCount;
+
 
         private void Init()
         {
@@ -125,7 +128,8 @@ namespace Fort23.Mono
                 toggleList.ShowTargetIndex(0);
                 TitleRoot.SetActive(true);
                 Rect_Sv.SetParent(Sv1root);
-                Rect_Sv.offsetMax = Vector2.zero;
+                Rect_Sv.transform.SetAsFirstSibling();
+                Rect_Sv.offsetMax =new Vector2(11.88f,0);
                 Rect_Sv.offsetMin = Vector2.zero;
                 // Rect_Sv.sizeDelta = new Vector2(718.82f, 844.7f);
                 // Rect_Sv.anchoredPosition = new Vector2(2.61f, -190.52f);
@@ -146,6 +150,19 @@ namespace Fort23.Mono
                     mainShengShiEventWidgetType2.own.SetActive(true);
                     mainShengShiEventWidgetType2.CustomInit1();
                 }
+
+                if (EventSystemManager.Instance.GetShenShiCount() > 0)
+                {
+                    DivineSenceHuoQuWidgetGam.SetActive(false);
+                }
+                else
+                {
+                    DivineSenceHuoQuWidgetGam.SetActive(true);
+                    DivineSenceHuoQuWidget shengShiEventWidgetType2 =
+                        await UIManager.Instance.CreateGComponentForObject<DivineSenceHuoQuWidget>(
+                            DivineSenceHuoQuWidgetGam, null);
+                    shengShiEventWidgetType2.OnClick = DivineSenceHuoQuWidgetOnClick;
+                }
             }
             //道友
             else
@@ -157,9 +174,10 @@ namespace Fort23.Mono
                 TitleRoot.SetActive(false);
 
                 Rect_Sv.SetParent(Sv2root);
-                Rect_Sv.offsetMax = Vector2.zero;
+                Rect_Sv.offsetMax  =new Vector2(11.88f,0);
                 Rect_Sv.offsetMin = Vector2.zero;
                 Text_Tips.gameObject.SetActive(showEventList.Count > 0);
+                DivineSenceHuoQuWidgetGam.SetActive(false);
             }
 
             var divineSenseConfig =
@@ -170,9 +188,13 @@ namespace Fort23.Mono
             Text_ShenShiCount.text =
                 LanguageManager.Instance.Text(10239, EventSystemManager.Instance.GetShenShiCount(), maxCount);
 
+
             SaiXuan(saixuanType);
             showEventList.Sort(Sort);
-            await Content.Init(this, showEventList.Count);
+            creatCount = EventSystemManager.Instance.GetShenShiCount() > 0 && saixuanType == 1
+                ? showEventList.Count + 1
+                : showEventList.Count;
+            await Content.Init(this, creatCount);
         }
 
         public int Sort(AccountFileInfo.EventList a, AccountFileInfo.EventList b)
@@ -214,18 +236,33 @@ namespace Fort23.Mono
 
         public async CTask<IScorllListWidget> GetIScorllListWidget(int index, RectTransform root)
         {
-            if (index < 0 || index >= showEventList.Count)
+            if (index < 0 || index >= creatCount)
             {
                 return null;
             }
 
+            if (index >= showEventList.Count && showEventList.Count != creatCount)
+            {
+                DivineSenceHuoQuWidget shengShiEventWidgetType2 =
+                    await UIManager.Instance.CreateGComponent<DivineSenceHuoQuWidget>(null, ContentRoot);
+                shengShiEventWidgetType2.OnClick = DivineSenceHuoQuWidgetOnClick;
+                shengShiEventWidgetTypeList.Add(shengShiEventWidgetType2);
+                return shengShiEventWidgetType2;
+            }
+            else
+            {
+                ShengShiEventWidgetType2 shengShiEventWidgetType2 =
+                    await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType2>(null, ContentRoot);
+                shengShiEventWidgetType2.CustomInit(showEventList[index], GoOnClick);
+                shengShiEventWidgetType2.OnClick = OnClick;
+                shengShiEventWidgetTypeList.Add(shengShiEventWidgetType2);
+                return shengShiEventWidgetType2;
+            }
+        }
 
-            ShengShiEventWidgetType2 shengShiEventWidgetType2 =
-                await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType2>(null, ContentRoot);
-            shengShiEventWidgetType2.CustomInit(showEventList[index], GoOnClick);
-            shengShiEventWidgetType2.OnClick = OnClick;
-            shengShiEventWidgetTypeList.Add(shengShiEventWidgetType2);
-            return shengShiEventWidgetType2;
+        private void DivineSenceHuoQuWidgetOnClick(ItemWidgetBasic obj)
+        {
+            SkiptoHelper.Skipto(5);
         }
 
         private void GoOnClick(ItemWidgetBasic obj)

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventPreviewPanelData.cs

@@ -184,6 +184,17 @@ namespace Fort23.Mono
 	      return _Sv2root;
 	     }
 	   }
+	  private GameObject _DivineSenceHuoQuWidgetGam;
+	  public GameObject DivineSenceHuoQuWidgetGam
+	   {
+	   get{
+	      if (_DivineSenceHuoQuWidgetGam == null)
+	       {
+	         _DivineSenceHuoQuWidgetGam  = GetUIUnit<GameObject>("DivineSenceHuoQuWidgetGam"); 
+	       }
+	      return _DivineSenceHuoQuWidgetGam;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceHuoQuWidget.cs

@@ -0,0 +1,24 @@
+namespace Fort23.Mono
+{
+	[UIBinding(prefab = "DivineSenceHuoQuWidget"  )]
+	public partial class DivineSenceHuoQuWidget : ItemWidgetBasic
+	{
+		private void Init()
+		{
+
+		}
+		public override void AddEvent()
+		{
+
+		}
+		public override void DelEvent()
+		{
+
+		}
+		public override void AddButtonEvent()
+		{
+			base.AddButtonEvent();
+		}
+
+	}
+}

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceHuoQuWidget.cs.meta

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

Assets/Scripts/GameUI/UI/DivineSence/GongFaWidgetType2.cs

@@ -41,6 +41,8 @@ namespace Fort23.Mono
             {
                 this.transform.Gray();
             }
+
+            StarRoot[0].transform.parent.gameObject.SetActive(false);
         }
 
         public void CustomInit(SkillInfo skillInfo, bool isUlock = true)
@@ -58,6 +60,19 @@ namespace Fort23.Mono
             {
                 this.transform.Gray();
             }
+
+            StarRoot[0].transform.parent.gameObject.SetActive(true);
+            for (var i = 0; i < StarRoot.Count; i++)
+            {
+                if (i < skillInfo.skillConfig.level - 1)
+                {
+                    StarRoot[i].gameObject.SetActive(true);
+                }
+                else
+                {
+                    StarRoot[i].gameObject.SetActive(false);
+                }
+            }
         }
 
         public override void DormancyObj()

Assets/Scripts/GameUI/UI/DivineSence/GongFaWidgetType2Data.cs

@@ -41,6 +41,17 @@ namespace Fort23.Mono
 	      return _Icon_FabaoIcon;
 	     }
 	   }
+	  private List<GameObject> _StarRoot;
+	  public List<GameObject> StarRoot
+	   {
+	   get{
+	      if (_StarRoot == null)
+	       {
+	         _StarRoot  = GetUIUnit<List<GameObject>>("StarRoot"); 
+	       }
+	      return _StarRoot;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemDetailsPanel.cs

@@ -64,7 +64,7 @@ namespace Fort23.Mono
             ItemAssociateConfig itemAssociateConfig =
                 ConfigComponent.Instance.Get<ItemAssociateConfig>(itemInfo.config.associateID);
 
-            if (itemAssociateConfig.LanID != -1)
+            if (itemAssociateConfig.LanID != -1 || itemAssociateConfig.LanID != 0)
             {
                 ItemDetailsWidget itemDetailsWidge2 =
                     await UIManager.Instance.CreateGComponent<ItemDetailsWidget>(null, Connect);

Assets/Scripts/GameUI/UI/SentimentPanel/SentimentInfoPanel.cs

@@ -241,7 +241,7 @@ namespace Fort23.Mono
                 int conFigId = sentimentEffectWidget.sentimentProperty.groupId * 10 + level;
                 var sentimentEffectConfig = ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId);
                 SentimentEffectWidget sentimentEffectWidget1 = null;
-                if (sentimentEffectConfig.lastSentimentEffectId == -1)
+                if (sentimentEffectConfig.lastSentimentEffectId == mainSentimentEffectWidget.sentimentEffectConfig.groupId)
                 {
                     sentimentEffectWidget1 = mainSentimentEffectWidget;
                 }
@@ -251,7 +251,12 @@ namespace Fort23.Mono
                         s.sentimentEffectConfig.groupId == sentimentEffectConfig.lastSentimentEffectId);
                 }
 
-                sentimentEffectWidget.CreatXian(XianRoot, sentimentEffectWidget1);
+                if (sentimentEffectWidget1 != null)
+                {
+                    sentimentEffectWidget.CreatXian(XianRoot, sentimentEffectWidget1);
+                }
+
+              
             }
         }
 

Assets/Scripts/GameUI/UI/ShopPanel/ShopGachaPanel.cs

@@ -59,18 +59,23 @@ namespace Fort23.Mono
             Btn_ShuangBei.onClick.AddListener(async () =>
             {
 #if UNITY_ANDROID && !UNITY_EDITOR&& Taptap
-                if (TakuSDKManager.Instance.IsReady())
+                if (!PlayerManager.Instance.BagController.IsEnough(23001, 1))
                 {
-                    bool isOK = await TakuSDKManager.Instance.ShowAutoAd();
-                    if (!isOK)
+                    if (TakuSDKManager.Instance.IsReady())
+                    {
+                        bool isOK = await TakuSDKManager.Instance.ShowAutoAd();
+                        if (!isOK)
+                        {
+                            return;
+                        }
+                    }
+                    else
                     {
                         return;
                     }
                 }
-                else
-                {
-                    return;
-                }
+
+        
 
 #endif
                 float beLv =