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

# Conflicts:
#	Assets/Scenes/testCombat.scene   resolved by origin/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/CombatScenes/LevelBattle03.prefab

@@ -150,7 +150,7 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 7169143794090459126}
-  m_Layer: 7
+  m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Landscape
   m_TagString: Untagged
@@ -185,7 +185,7 @@ GameObject:
   - component: {fileID: 3585384551010318200}
   - component: {fileID: 4077837472308421636}
   - component: {fileID: 4513731945305176033}
-  m_Layer: 7
+  m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: yun_qiu
   m_TagString: Untagged
@@ -359,7 +359,7 @@ GameObject:
   - component: {fileID: 3271622544173978875}
   - component: {fileID: 3485194297984294891}
   - component: {fileID: 6475305682505242889}
-  m_Layer: 7
+  m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Mesh
   m_TagString: Untagged

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/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/Scenes/testCombat.scene

@@ -504,7 +504,7 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!213 &262437933
+--- !u!213 &333746269
 Sprite:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1529,7 +1529,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 262437933}
+  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/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]