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

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

@@ -0,0 +1,92 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ui_ob_yindao_glow_add
+  m_Shader: {fileID: 4800000, guid: 7d5403880352cd348b8ca3d1f3a67447, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _AlphaTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 614d54c567660424497d0b9e73765fac, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Mask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MaskTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _Alpha: 0
+    - _AlphaCutoff: 0.5
+    - _ColorMask: 15
+    - _EnableExternalAlpha: 0
+    - _MainSpeedU: 0.5
+    - _MainSpeedV: 0.5
+    - _MainTexOffsetU: 0
+    - _MainTexOffsetV: 0
+    - _MainTilingU: 1
+    - _MainTilingV: 1
+    - _MaskSpeedU: 0.5
+    - _MaskSpeedV: 0.5
+    - _MaskTexOffsetU: 0
+    - _MaskTexOffsetV: 0
+    - _MaskTilingU: 1
+    - _MaskTilingV: 1
+    - _MaskTimeSpeedON1: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _TimeSpeedON: 0
+    - _UseUIAlphaClip: 0
+    m_Colors:
+    - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
+    - _Color: {r: 0.8915093, g: 0.23275402, b: 0, a: 1}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Flip: {r: 1, g: 1, b: 1, a: 1}
+    - _RendererColor: {r: 1, g: 1, b: 1, a: 1}
+  m_BuildTextureStacks: []

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

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: DX0etiirW3tY9N43qqiN6pZIIDAyMuXrMYf9jBWBv8NeaD/bA0HWEnWy8NbW
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,94 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ui_ob_yindao_quan
+  m_Shader: {fileID: 4800000, guid: 7d5403880352cd348b8ca3d1f3a67447, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _AlphaTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 95e602e250156af468901ae4f4b3fa00, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Mask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MaskTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _Alpha: 0
+    - _AlphaCutoff: 0.5
+    - _ColorMask: 0
+    - _EnableExternalAlpha: 0
+    - _Intensity: 1
+    - _MainSpeedU: 0.5
+    - _MainSpeedV: 0.5
+    - _MainTexOffsetU: 0
+    - _MainTexOffsetV: 0
+    - _MainTexRotation: 0
+    - _MainTilingU: 1
+    - _MainTilingV: 1
+    - _MaskSpeedU: 0.5
+    - _MaskSpeedV: 0.5
+    - _MaskTexOffsetU: 0
+    - _MaskTexOffsetV: 0
+    - _MaskTilingU: 1
+    - _MaskTilingV: 1
+    - _MaskTimeSpeedON1: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
+    - _Stencil: 0
+    - _StencilComp: 0
+    - _StencilOp: 0
+    - _StencilReadMask: 0
+    - _StencilWriteMask: 0
+    - _TimeSpeedON: 0
+    - _ca: 1
+    m_Colors:
+    - _Color: {r: 2.0727692, g: 0.957228, b: 0.0782174, a: 1}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Flip: {r: 1, g: 1, b: 1, a: 1}
+    - _MainTexChannel: {r: 1, g: 0, b: 0, a: 0}
+    - _RendererColor: {r: 1, g: 1, b: 1, a: 1}
+  m_BuildTextureStacks: []

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

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: WikWtXz7AXhjNTWQ2k33IDf2+8p/Vq51mXO9tfrHrCluSLULVovPSLtXEs25
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Config/DivineSenseConfig.json

@@ -10,254 +10,254 @@
         0.0,
         0.0
       ],
-      "exp": 1000,
+      "exp": 500,
       "MaxNum": 2
     },
     {
       "ID": 2,
       "QualityBonusChance": [
-        685.0,
-        210.0,
-        105.0,
+        676.0,
+        216.0,
+        108.0,
         0.0,
         0.0,
         0.0
       ],
-      "exp": 3000,
+      "exp": 500,
       "MaxNum": 3
     },
     {
       "ID": 3,
       "QualityBonusChance": [
-        670.0,
-        220.0,
-        110.0,
+        649.0,
+        234.0,
+        117.0,
         0.0,
         0.0,
         0.0
       ],
-      "exp": 6000,
+      "exp": 500,
       "MaxNum": 4
     },
     {
       "ID": 4,
       "QualityBonusChance": [
-        655.0,
-        230.0,
-        115.0,
+        622.0,
+        252.0,
+        126.0,
         0.0,
         0.0,
         0.0
       ],
-      "exp": 10000,
+      "exp": 500,
       "MaxNum": 5
     },
     {
       "ID": 5,
       "QualityBonusChance": [
-        635.0,
-        240.0,
-        120.0,
-        5.0,
+        595.0,
+        270.0,
+        135.0,
+        0.0,
         0.0,
         0.0
       ],
-      "exp": 15000,
+      "exp": 1000,
       "MaxNum": 6
     },
     {
       "ID": 6,
       "QualityBonusChance": [
-        615.0,
-        250.0,
-        125.0,
-        10.0,
+        550.0,
+        288.0,
+        144.0,
+        18.0,
         0.0,
         0.0
       ],
-      "exp": 21000,
+      "exp": 1000,
       "MaxNum": 6
     },
     {
       "ID": 7,
       "QualityBonusChance": [
-        595.0,
-        260.0,
-        130.0,
-        15.0,
+        515.0,
+        306.0,
+        153.0,
+        26.0,
         0.0,
         0.0
       ],
-      "exp": 27000,
+      "exp": 1000,
       "MaxNum": 6
     },
     {
       "ID": 8,
       "QualityBonusChance": [
-        575.0,
-        270.0,
-        135.0,
-        20.0,
+        480.0,
+        324.0,
+        162.0,
+        34.0,
         0.0,
         0.0
       ],
-      "exp": 33000,
+      "exp": 1000,
       "MaxNum": 6
     },
     {
       "ID": 9,
       "QualityBonusChance": [
-        555.0,
-        280.0,
-        140.0,
-        25.0,
+        445.0,
+        342.0,
+        171.0,
+        42.0,
         0.0,
         0.0
       ],
-      "exp": 39000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 10,
       "QualityBonusChance": [
-        531.0,
-        290.0,
-        145.0,
-        30.0,
-        4.0,
+        410.0,
+        360.0,
+        180.0,
+        50.0,
+        0.0,
         0.0
       ],
-      "exp": 45000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 11,
       "QualityBonusChance": [
-        507.0,
-        300.0,
-        150.0,
-        35.0,
-        8.0,
+        369.0,
+        378.0,
+        189.0,
+        58.0,
+        6.0,
         0.0
       ],
-      "exp": 51000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 12,
       "QualityBonusChance": [
-        483.0,
-        310.0,
-        155.0,
-        40.0,
+        328.0,
+        396.0,
+        198.0,
+        66.0,
         12.0,
         0.0
       ],
-      "exp": 57000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 13,
       "QualityBonusChance": [
-        459.0,
-        320.0,
-        160.0,
-        45.0,
-        16.0,
+        287.0,
+        414.0,
+        207.0,
+        74.0,
+        18.0,
         0.0
       ],
-      "exp": 63000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 14,
       "QualityBonusChance": [
-        435.0,
-        330.0,
-        165.0,
-        50.0,
-        20.0,
+        246.0,
+        432.0,
+        216.0,
+        82.0,
+        24.0,
         0.0
       ],
-      "exp": 69000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 15,
       "QualityBonusChance": [
-        411.0,
-        340.0,
-        170.0,
-        55.0,
-        24.0,
+        205.0,
+        450.0,
+        225.0,
+        90.0,
+        30.0,
         0.0
       ],
-      "exp": 75000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 16,
       "QualityBonusChance": [
-        387.0,
-        350.0,
-        175.0,
-        60.0,
-        28.0,
+        164.0,
+        468.0,
+        234.0,
+        98.0,
+        36.0,
         0.0
       ],
-      "exp": 81000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 17,
       "QualityBonusChance": [
-        363.0,
-        360.0,
-        180.0,
-        65.0,
-        32.0,
+        123.0,
+        486.0,
+        243.0,
+        106.0,
+        42.0,
         0.0
       ],
-      "exp": 87000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 18,
       "QualityBonusChance": [
-        339.0,
-        370.0,
-        185.0,
-        70.0,
-        36.0,
+        82.0,
+        504.0,
+        252.0,
+        114.0,
+        48.0,
         0.0
       ],
-      "exp": 93000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 19,
       "QualityBonusChance": [
-        315.0,
-        380.0,
-        190.0,
-        75.0,
-        40.0,
+        41.0,
+        522.0,
+        261.0,
+        122.0,
+        54.0,
         0.0
       ],
-      "exp": 99000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 20,
       "QualityBonusChance": [
-        291.0,
-        390.0,
-        195.0,
-        80.0,
-        44.0,
+        0.0,
+        540.0,
+        270.0,
+        130.0,
+        60.0,
         0.0
       ],
-      "exp": 105000,
+      "exp": 1000000,
       "MaxNum": 6
     }
   ]

Assets/Res/Config/DropConfig.json

@@ -61,93 +61,113 @@
       ]
     },
     {
-      "ID": 1201,
+      "ID": 1007,
       "dropGroupID": [
-        1201
+        1007
       ],
       "dropType": 3,
       "showItemId": [
-        1201
+        1007
       ]
     },
     {
-      "ID": 1202,
+      "ID": 1101,
       "dropGroupID": [
-        1202
+        1101
       ],
       "dropType": 3,
       "showItemId": [
-        1202
+        1101
       ]
     },
     {
-      "ID": 1203,
+      "ID": 1102,
       "dropGroupID": [
-        1203
+        1102
       ],
       "dropType": 3,
       "showItemId": [
-        1203
+        1102
       ]
     },
     {
-      "ID": 1204,
+      "ID": 1103,
       "dropGroupID": [
-        1204
+        1103
       ],
       "dropType": 3,
       "showItemId": [
-        1204
+        1103
+      ]
+    },
+    {
+      "ID": 1104,
+      "dropGroupID": [
+        1104
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1104
+      ]
+    },
+    {
+      "ID": 1105,
+      "dropGroupID": [
+        1105
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1105
       ]
     },
     {
-      "ID": 1205,
+      "ID": 1106,
       "dropGroupID": [
-        1205
+        1106
       ],
       "dropType": 3,
       "showItemId": [
-        1205
+        1106
       ]
     },
     {
-      "ID": 1206,
+      "ID": 1201,
       "dropGroupID": [
-        1206
+        1201
       ],
       "dropType": 3,
       "showItemId": [
-        1206
+        1201
       ]
     },
     {
-      "ID": 1207,
+      "ID": 1202,
       "dropGroupID": [
-        1207
+        1202
       ],
       "dropType": 3,
       "showItemId": [
-        1207
+        1202
       ]
     },
     {
-      "ID": 1208,
+      "ID": 1203,
       "dropGroupID": [
-        1208
+        1203
       ],
       "dropType": 3,
       "showItemId": [
-        1208
+        1203
       ]
     },
     {
-      "ID": 1209,
+      "ID": 1204,
       "dropGroupID": [
-        1209
+        1204
       ],
       "dropType": 3,
       "showItemId": [
-        1209
+        1204
       ]
     },
     {
@@ -190,6 +210,56 @@
         1304
       ]
     },
+    {
+      "ID": 1305,
+      "dropGroupID": [
+        1305
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1305
+      ]
+    },
+    {
+      "ID": 1306,
+      "dropGroupID": [
+        1306
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1306
+      ]
+    },
+    {
+      "ID": 1307,
+      "dropGroupID": [
+        1307
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1307
+      ]
+    },
+    {
+      "ID": 1308,
+      "dropGroupID": [
+        1308
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1308
+      ]
+    },
+    {
+      "ID": 1309,
+      "dropGroupID": [
+        1309
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1309
+      ]
+    },
     {
       "ID": 1401,
       "dropGroupID": [
@@ -260,6 +330,36 @@
         1601
       ]
     },
+    {
+      "ID": 1701,
+      "dropGroupID": [
+        1701
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1701
+      ]
+    },
+    {
+      "ID": 1702,
+      "dropGroupID": [
+        1702
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1702
+      ]
+    },
+    {
+      "ID": 1703,
+      "dropGroupID": [
+        1703
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1703
+      ]
+    },
     {
       "ID": 10001,
       "dropGroupID": [
@@ -830,6 +930,96 @@
         12510
       ]
     },
+    {
+      "ID": 12511,
+      "dropGroupID": [
+        12511
+      ],
+      "dropType": 3,
+      "showItemId": [
+        12511
+      ]
+    },
+    {
+      "ID": 12512,
+      "dropGroupID": [
+        12512
+      ],
+      "dropType": 3,
+      "showItemId": [
+        12512
+      ]
+    },
+    {
+      "ID": 12513,
+      "dropGroupID": [
+        12513
+      ],
+      "dropType": 3,
+      "showItemId": [
+        12513
+      ]
+    },
+    {
+      "ID": 12514,
+      "dropGroupID": [
+        12514
+      ],
+      "dropType": 3,
+      "showItemId": [
+        12514
+      ]
+    },
+    {
+      "ID": 12515,
+      "dropGroupID": [
+        12515
+      ],
+      "dropType": 3,
+      "showItemId": [
+        12515
+      ]
+    },
+    {
+      "ID": 12516,
+      "dropGroupID": [
+        12516
+      ],
+      "dropType": 3,
+      "showItemId": [
+        12516
+      ]
+    },
+    {
+      "ID": 12517,
+      "dropGroupID": [
+        12517
+      ],
+      "dropType": 3,
+      "showItemId": [
+        12517
+      ]
+    },
+    {
+      "ID": 12518,
+      "dropGroupID": [
+        12518
+      ],
+      "dropType": 3,
+      "showItemId": [
+        12518
+      ]
+    },
+    {
+      "ID": 12519,
+      "dropGroupID": [
+        12519
+      ],
+      "dropType": 3,
+      "showItemId": [
+        12519
+      ]
+    },
     {
       "ID": 13001,
       "dropGroupID": [
@@ -1180,6 +1370,96 @@
         13510
       ]
     },
+    {
+      "ID": 13511,
+      "dropGroupID": [
+        13511
+      ],
+      "dropType": 3,
+      "showItemId": [
+        13511
+      ]
+    },
+    {
+      "ID": 13512,
+      "dropGroupID": [
+        13512
+      ],
+      "dropType": 3,
+      "showItemId": [
+        13512
+      ]
+    },
+    {
+      "ID": 13513,
+      "dropGroupID": [
+        13513
+      ],
+      "dropType": 3,
+      "showItemId": [
+        13513
+      ]
+    },
+    {
+      "ID": 13514,
+      "dropGroupID": [
+        13514
+      ],
+      "dropType": 3,
+      "showItemId": [
+        13514
+      ]
+    },
+    {
+      "ID": 13515,
+      "dropGroupID": [
+        13515
+      ],
+      "dropType": 3,
+      "showItemId": [
+        13515
+      ]
+    },
+    {
+      "ID": 13516,
+      "dropGroupID": [
+        13516
+      ],
+      "dropType": 3,
+      "showItemId": [
+        13516
+      ]
+    },
+    {
+      "ID": 13517,
+      "dropGroupID": [
+        13517
+      ],
+      "dropType": 3,
+      "showItemId": [
+        13517
+      ]
+    },
+    {
+      "ID": 13518,
+      "dropGroupID": [
+        13518
+      ],
+      "dropType": 3,
+      "showItemId": [
+        13518
+      ]
+    },
+    {
+      "ID": 13519,
+      "dropGroupID": [
+        13519
+      ],
+      "dropType": 3,
+      "showItemId": [
+        13519
+      ]
+    },
     {
       "ID": 20001,
       "dropGroupID": [
@@ -1211,27 +1491,113 @@
       ]
     },
     {
-      "ID": 999001,
+      "ID": 20004,
       "dropGroupID": [
-        1,
-        2,
-        3
+        20004
       ],
-      "dropType": 2,
+      "dropType": 3,
       "showItemId": [
-        10001
+        20004
       ]
     },
     {
-      "ID": 999002,
+      "ID": 20005,
       "dropGroupID": [
-        4,
-        5,
-        6
+        20005
       ],
-      "dropType": 2,
+      "dropType": 3,
       "showItemId": [
-        12001
+        20005
+      ]
+    },
+    {
+      "ID": 20006,
+      "dropGroupID": [
+        20006
+      ],
+      "dropType": 3,
+      "showItemId": [
+        20006
+      ]
+    },
+    {
+      "ID": 20007,
+      "dropGroupID": [
+        20007
+      ],
+      "dropType": 3,
+      "showItemId": [
+        20007
+      ]
+    },
+    {
+      "ID": 20008,
+      "dropGroupID": [
+        20008
+      ],
+      "dropType": 3,
+      "showItemId": [
+        20008
+      ]
+    },
+    {
+      "ID": 20009,
+      "dropGroupID": [
+        20009
+      ],
+      "dropType": 3,
+      "showItemId": [
+        20009
+      ]
+    },
+    {
+      "ID": 20010,
+      "dropGroupID": [
+        20010
+      ],
+      "dropType": 3,
+      "showItemId": [
+        20010
+      ]
+    },
+    {
+      "ID": 20011,
+      "dropGroupID": [
+        20011
+      ],
+      "dropType": 3,
+      "showItemId": [
+        20011
+      ]
+    },
+    {
+      "ID": 20012,
+      "dropGroupID": [
+        20012
+      ],
+      "dropType": 3,
+      "showItemId": [
+        20012
+      ]
+    },
+    {
+      "ID": 20013,
+      "dropGroupID": [
+        20013
+      ],
+      "dropType": 3,
+      "showItemId": [
+        20013
+      ]
+    },
+    {
+      "ID": 20014,
+      "dropGroupID": [
+        20014
+      ],
+      "dropType": 3,
+      "showItemId": [
+        20014
       ]
     },
     {
@@ -1434,6 +1800,70 @@
         22007
       ]
     },
+    {
+      "ID": 23001,
+      "dropGroupID": [
+        23001
+      ],
+      "dropType": 3,
+      "showItemId": [
+        23001
+      ]
+    },
+    {
+      "ID": 23002,
+      "dropGroupID": [
+        23002
+      ],
+      "dropType": 3,
+      "showItemId": [
+        23002
+      ]
+    },
+    {
+      "ID": 23101,
+      "dropGroupID": [
+        23101
+      ],
+      "dropType": 3,
+      "showItemId": [
+        23101
+      ]
+    },
+    {
+      "ID": 23102,
+      "dropGroupID": [
+        23102
+      ],
+      "dropType": 3,
+      "showItemId": [
+        23102
+      ]
+    },
+    {
+      "ID": 999001,
+      "dropGroupID": [
+        1,
+        2,
+        3
+      ],
+      "dropType": 2,
+      "showItemId": [
+        10001
+      ]
+    },
+    {
+      "ID": 999002,
+      "dropGroupID": [
+        4,
+        5,
+        6
+      ],
+      "dropType": 2,
+      "showItemId": [
+        12001
+      ]
+    },
     {
       "ID": 999003,
       "dropGroupID": [

Assets/Res/Config/EventConfig.json

@@ -19,7 +19,7 @@
         999001
       ],
       "PrizeNums": [
-        -1000,
+        -500,
         1
       ],
       "RefreshProbability": 10,
@@ -51,7 +51,7 @@
         999002
       ],
       "PrizeNums": [
-        -1000,
+        -500,
         1
       ],
       "RefreshProbability": 10,
@@ -83,7 +83,7 @@
         1001
       ],
       "PrizeNums": [
-        -1000,
+        -500,
         -5000
       ],
       "RefreshProbability": 100,
@@ -115,7 +115,7 @@
         1005
       ],
       "PrizeNums": [
-        -1000,
+        -500,
         -5000
       ],
       "RefreshProbability": 100,
@@ -147,7 +147,7 @@
         1006
       ],
       "PrizeNums": [
-        -1000,
+        -500,
         -5000
       ],
       "RefreshProbability": 100,
@@ -179,7 +179,7 @@
         1002
       ],
       "PrizeNums": [
-        -1000,
+        -500,
         100
       ],
       "RefreshProbability": 30,
@@ -211,7 +211,7 @@
         1004
       ],
       "PrizeNums": [
-        -1000,
+        -500,
         10
       ],
       "RefreshProbability": 20,
@@ -243,7 +243,7 @@
         1501
       ],
       "PrizeNums": [
-        -1000,
+        -500,
         1
       ],
       "RefreshProbability": 60,
@@ -275,7 +275,7 @@
         1601
       ],
       "PrizeNums": [
-        -1000,
+        -500,
         1
       ],
       "RefreshProbability": 40,
@@ -307,7 +307,7 @@
         999001
       ],
       "PrizeNums": [
-        -1100,
+        -750,
         1
       ],
       "RefreshProbability": 15,
@@ -339,7 +339,7 @@
         999002
       ],
       "PrizeNums": [
-        -1100,
+        -750,
         1
       ],
       "RefreshProbability": 15,
@@ -371,7 +371,7 @@
         1001
       ],
       "PrizeNums": [
-        -1100,
+        -750,
         -5000
       ],
       "RefreshProbability": 100,
@@ -403,7 +403,7 @@
         1005
       ],
       "PrizeNums": [
-        -1100,
+        -750,
         -5000
       ],
       "RefreshProbability": 100,
@@ -435,7 +435,7 @@
         1006
       ],
       "PrizeNums": [
-        -1100,
+        -750,
         -5000
       ],
       "RefreshProbability": 100,
@@ -467,7 +467,7 @@
         1002
       ],
       "PrizeNums": [
-        -1100,
+        -750,
         100
       ],
       "RefreshProbability": 35,
@@ -499,7 +499,7 @@
         1004
       ],
       "PrizeNums": [
-        -1100,
+        -750,
         10
       ],
       "RefreshProbability": 25,
@@ -531,7 +531,7 @@
         1501
       ],
       "PrizeNums": [
-        -1100,
+        -750,
         1
       ],
       "RefreshProbability": 65,
@@ -563,7 +563,7 @@
         1601
       ],
       "PrizeNums": [
-        -1100,
+        -750,
         1
       ],
       "RefreshProbability": 45,
@@ -595,7 +595,7 @@
         999001
       ],
       "PrizeNums": [
-        -1200,
+        -1500,
         1
       ],
       "RefreshProbability": 20,
@@ -627,7 +627,7 @@
         999002
       ],
       "PrizeNums": [
-        -1200,
+        -1500,
         1
       ],
       "RefreshProbability": 20,
@@ -659,7 +659,7 @@
         1001
       ],
       "PrizeNums": [
-        -1200,
+        -1500,
         -5000
       ],
       "RefreshProbability": 100,
@@ -691,7 +691,7 @@
         1005
       ],
       "PrizeNums": [
-        -1200,
+        -1500,
         -5000
       ],
       "RefreshProbability": 100,
@@ -723,7 +723,7 @@
         1006
       ],
       "PrizeNums": [
-        -1200,
+        -1500,
         -5000
       ],
       "RefreshProbability": 100,
@@ -755,7 +755,7 @@
         1002
       ],
       "PrizeNums": [
-        -1200,
+        -1500,
         100
       ],
       "RefreshProbability": 40,
@@ -787,7 +787,7 @@
         1004
       ],
       "PrizeNums": [
-        -1200,
+        -1500,
         10
       ],
       "RefreshProbability": 30,
@@ -819,7 +819,7 @@
         1501
       ],
       "PrizeNums": [
-        -1200,
+        -1500,
         1
       ],
       "RefreshProbability": 70,
@@ -851,7 +851,7 @@
         1601
       ],
       "PrizeNums": [
-        -1200,
+        -1500,
         1
       ],
       "RefreshProbability": 50,
@@ -883,7 +883,7 @@
         999001
       ],
       "PrizeNums": [
-        -1300,
+        -3000,
         1
       ],
       "RefreshProbability": 25,
@@ -915,7 +915,7 @@
         999002
       ],
       "PrizeNums": [
-        -1300,
+        -3000,
         1
       ],
       "RefreshProbability": 25,
@@ -947,7 +947,7 @@
         1001
       ],
       "PrizeNums": [
-        -1300,
+        -3000,
         -5000
       ],
       "RefreshProbability": 100,
@@ -979,7 +979,7 @@
         1005
       ],
       "PrizeNums": [
-        -1300,
+        -3000,
         -5000
       ],
       "RefreshProbability": 100,
@@ -1011,7 +1011,7 @@
         1006
       ],
       "PrizeNums": [
-        -1300,
+        -3000,
         -5000
       ],
       "RefreshProbability": 100,
@@ -1043,7 +1043,7 @@
         1002
       ],
       "PrizeNums": [
-        -1300,
+        -3000,
         100
       ],
       "RefreshProbability": 45,
@@ -1075,7 +1075,7 @@
         1004
       ],
       "PrizeNums": [
-        -1300,
+        -3000,
         10
       ],
       "RefreshProbability": 35,
@@ -1107,7 +1107,7 @@
         1501
       ],
       "PrizeNums": [
-        -1300,
+        -3000,
         1
       ],
       "RefreshProbability": 75,
@@ -1139,7 +1139,7 @@
         1601
       ],
       "PrizeNums": [
-        -1300,
+        -3000,
         1
       ],
       "RefreshProbability": 55,
@@ -1171,7 +1171,7 @@
         999001
       ],
       "PrizeNums": [
-        -1400,
+        -5000,
         1
       ],
       "RefreshProbability": 30,
@@ -1203,7 +1203,7 @@
         999002
       ],
       "PrizeNums": [
-        -1400,
+        -5000,
         1
       ],
       "RefreshProbability": 30,
@@ -1235,7 +1235,7 @@
         1001
       ],
       "PrizeNums": [
-        -1400,
+        -5000,
         -5000
       ],
       "RefreshProbability": 100,
@@ -1267,7 +1267,7 @@
         1005
       ],
       "PrizeNums": [
-        -1400,
+        -5000,
         -5000
       ],
       "RefreshProbability": 100,
@@ -1299,7 +1299,7 @@
         1006
       ],
       "PrizeNums": [
-        -1400,
+        -5000,
         -5000
       ],
       "RefreshProbability": 100,
@@ -1331,7 +1331,7 @@
         1002
       ],
       "PrizeNums": [
-        -1400,
+        -5000,
         100
       ],
       "RefreshProbability": 50,
@@ -1363,7 +1363,7 @@
         1004
       ],
       "PrizeNums": [
-        -1400,
+        -5000,
         10
       ],
       "RefreshProbability": 40,
@@ -1395,7 +1395,7 @@
         1501
       ],
       "PrizeNums": [
-        -1400,
+        -5000,
         1
       ],
       "RefreshProbability": 80,
@@ -1427,7 +1427,7 @@
         1601
       ],
       "PrizeNums": [
-        -1400,
+        -5000,
         1
       ],
       "RefreshProbability": 60,
@@ -4428,7 +4428,7 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 3,
-      "RefreshProbability": 30,
+      "RefreshProbability": 100,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 1,

Assets/Res/Config/GameConstantConfig.json

@@ -46,9 +46,9 @@
       ],
       "qiankundaiMaxTime": 43200,
       "shenshiPointRecSPD": [
-        10000.0,
-        2.0,
-        0.05
+        2000.0,
+        0.023148,
+        0.023148
       ]
     }
   ]

Assets/Res/Config/HeroModelConfig.json

@@ -1050,7 +1050,7 @@
       "model": "Boss_fenghuang",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 105,
+      "attack": 150,
       "hp": 300,
       "def": 100,
       "shield": 300,

Assets/Res/UI/GuidePanel/GuideHand.prefab

@@ -120,6 +120,8 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 559048862761468158}
+  - {fileID: 4859298660771053476}
   - {fileID: 734780392825207828}
   - {fileID: 1687954597818881594}
   m_Father: {fileID: 0}
@@ -207,6 +209,256 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
+--- !u!1 &5287169494778414569
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 559048862761468158}
+  - component: {fileID: 4284619971589467747}
+  - component: {fileID: 6514837214852521581}
+  - component: {fileID: 217192112549898342}
+  - component: {fileID: 5493032757195695916}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: obyindaoglow
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &559048862761468158
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5287169494778414569}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 707.505, y: 707.505, z: 707.505}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 734780393184598389}
+  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.00010325}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!33 &4284619971589467747
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5287169494778414569}
+  m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &6514837214852521581
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5287169494778414569}
+  m_Enabled: 0
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 271326802a434724d97bfc8a823eea5e, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!222 &217192112549898342
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5287169494778414569}
+  m_CullTransparentMesh: 1
+--- !u!114 &5493032757195695916
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5287169494778414569}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f5e1d33d8c6440147a652242da460aa0, 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: []
+  _material: {fileID: 2100000, guid: 271326802a434724d97bfc8a823eea5e, type: 2}
+  _Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+  isNewMaterial: 0
+  Camera: {fileID: 0}
+--- !u!1 &7448694573110418986
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4859298660771053476}
+  - component: {fileID: 8875242389735633327}
+  - component: {fileID: 1255425239809916940}
+  - component: {fileID: 497913008934607685}
+  - component: {fileID: 3089208175986317632}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: obyindaoquan
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4859298660771053476
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7448694573110418986}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 150, y: 150, z: 150}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 734780393184598389}
+  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: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!33 &8875242389735633327
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7448694573110418986}
+  m_Mesh: {fileID: 7450741763379908841, guid: 76d2ca31c31fede4db041d5a0a2d9b7b, type: 3}
+--- !u!23 &1255425239809916940
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7448694573110418986}
+  m_Enabled: 0
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: ec90ffb33e78936458f3ef4b5a77becf, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!222 &497913008934607685
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7448694573110418986}
+  m_CullTransparentMesh: 1
+--- !u!114 &3089208175986317632
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7448694573110418986}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f5e1d33d8c6440147a652242da460aa0, 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: []
+  _material: {fileID: 2100000, guid: ec90ffb33e78936458f3ef4b5a77becf, type: 2}
+  _Mesh: {fileID: 7450741763379908841, guid: 76d2ca31c31fede4db041d5a0a2d9b7b, type: 3}
+  isNewMaterial: 0
+  Camera: {fileID: 0}
 --- !u!1001 &8032866909881840609
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -217,7 +469,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 6771112416032687343, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
       propertyPath: m_Enabled
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6771112416032687343, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
       propertyPath: m_SortingLayer
@@ -225,19 +477,59 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8653288616813134132, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
       propertyPath: m_Enabled
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8653288616813134132, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8653288616813134133, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.73
+      objectReference: {fileID: 0}
+    - target: {fileID: 8653288616813134133, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.55
+      objectReference: {fileID: 0}
+    - target: {fileID: 8653288616813134135, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+      propertyPath: lengthInSec
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8653288616813134135, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+      propertyPath: InitialModule.startLifetime.scalar
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8653288616813134135, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+      propertyPath: ColorModule.gradient.maxGradient.ctime1
+      value: 14938
+      objectReference: {fileID: 0}
+    - target: {fileID: 8653288616813134135, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+      propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[0].value
+      value: 0.8502655
+      objectReference: {fileID: 0}
+    - target: {fileID: 8653288616813134135, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+      propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[0].inSlope
+      value: 0.1497345
+      objectReference: {fileID: 0}
+    - target: {fileID: 8653288616813134135, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+      propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[1].inSlope
+      value: 0.1497345
+      objectReference: {fileID: 0}
+    - target: {fileID: 8653288616813134135, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+      propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[0].outSlope
+      value: 0.1497345
+      objectReference: {fileID: 0}
+    - target: {fileID: 8653288616813134135, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+      propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[1].outSlope
+      value: 0.1497345
+      objectReference: {fileID: 0}
     - target: {fileID: 8653288617156044248, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
       propertyPath: m_Name
       value: fx_ui_yindao
       objectReference: {fileID: 0}
     - target: {fileID: 8653288617156044248, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
       propertyPath: m_Pivot.x
@@ -273,15 +565,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
       propertyPath: m_LocalScale.x
-      value: 0
+      value: 216.53334
       objectReference: {fileID: 0}
     - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
       propertyPath: m_LocalScale.y
-      value: 0
+      value: 216.53334
       objectReference: {fileID: 0}
     - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
       propertyPath: m_LocalScale.z
-      value: 0
+      value: 216.53334
       objectReference: {fileID: 0}
     - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
       propertyPath: m_LocalPosition.x
@@ -331,6 +623,54 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 9020118135681059953, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+      propertyPath: lengthInSec
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 9020118135681059953, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+      propertyPath: InitialModule.startLifetime.scalar
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 9020118135681059953, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+      propertyPath: ColorModule.gradient.maxGradient.ctime1
+      value: 14938
+      objectReference: {fileID: 0}
+    - target: {fileID: 9020118135681059953, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+      propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[0].value
+      value: 0.51604843
+      objectReference: {fileID: 0}
+    - target: {fileID: 9020118135681059953, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+      propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[0].inSlope
+      value: 0.48395157
+      objectReference: {fileID: 0}
+    - target: {fileID: 9020118135681059953, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+      propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[1].inSlope
+      value: 0.48395157
+      objectReference: {fileID: 0}
+    - target: {fileID: 9020118135681059953, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+      propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[0].outSlope
+      value: 0.48395157
+      objectReference: {fileID: 0}
+    - target: {fileID: 9020118135681059953, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+      propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[1].inWeight
+      value: 0.33333334
+      objectReference: {fileID: 0}
+    - target: {fileID: 9020118135681059953, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+      propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[1].outSlope
+      value: 0.48395157
+      objectReference: {fileID: 0}
+    - target: {fileID: 9020118135681059953, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+      propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[0].outWeight
+      value: 0.33333334
+      objectReference: {fileID: 0}
+    - target: {fileID: 9020118135681059953, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+      propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[0].tangentMode
+      value: 34
+      objectReference: {fileID: 0}
+    - target: {fileID: 9020118135681059953, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+      propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[1].tangentMode
+      value: 34
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

Assets/Res/UI/GuidePanel/loop.anim

@@ -50,7 +50,225 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     path: Image
-  m_FloatCurves: []
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0.13333334
+        value: {x: 100, y: 100, z: 100}
+        inSlope: {x: 617.0314, y: 642.7426, z: 616.7219}
+        outSlope: {x: 617.0314, y: 642.7426, z: 616.7219}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.07149983, y: 0.06775966, z: 0.073369935}
+      - serializedVersion: 3
+        time: 1
+        value: {x: 320, y: 320, z: 320}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: obyindaoquan
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0.25
+        value: {x: 707.505, y: 707.505, z: 707.505}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.7
+        value: {x: 938.85913, y: 938.85913, z: 938.85913}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: obyindaoglow
+  m_FloatCurves:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0.13333334
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.25
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.56666666
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: material._Alpha
+    path: obyindaoquan
+    classID: 23
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.9
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: fx_ui_yindao
+    classID: 1
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.9
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: fx_ui_yindao/glow add
+    classID: 1
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.25
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.7
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: material._Alpha
+    path: obyindaoglow
+    classID: 23
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -0.00010325
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.7
+        value: -0.00012906
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.y
+    path: obyindaoglow
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
   m_PPtrCurves: []
   m_SampleRate: 60
   m_WrapMode: 0
@@ -68,6 +286,69 @@ AnimationClip:
       isPPtrCurve: 0
       isIntCurve: 0
       isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 3861913253
+      attribute: 3
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 2052918103
+      attribute: 3
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 3861913253
+      attribute: 2333735666
+      script: {fileID: 0}
+      typeID: 23
+      customType: 22
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 2643085686
+      attribute: 2086281974
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 95781324
+      attribute: 2086281974
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 2052918103
+      attribute: 2333735666
+      script: {fileID: 0}
+      typeID: 23
+      customType: 22
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 2052918103
+      attribute: 538195251
+      script: {fileID: 0}
+      typeID: 224
+      customType: 28
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
     pptrCurveMapping: []
   m_AnimationClipSettings:
     serializedVersion: 2
@@ -207,6 +488,354 @@ AnimationClip:
     classID: 224
     script: {fileID: 0}
     flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0.13333334
+        value: 100
+        inSlope: 617.0314
+        outSlope: 617.0314
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.07149983
+      - serializedVersion: 3
+        time: 1
+        value: 320
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.x
+    path: obyindaoquan
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0.13333334
+        value: 100
+        inSlope: 642.7426
+        outSlope: 642.7426
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.06775966
+      - serializedVersion: 3
+        time: 1
+        value: 320
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.y
+    path: obyindaoquan
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0.13333334
+        value: 100
+        inSlope: 616.7219
+        outSlope: 616.7219
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.073369935
+      - serializedVersion: 3
+        time: 1
+        value: 320
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.z
+    path: obyindaoquan
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0.13333334
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.25
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.56666666
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: material._Alpha
+    path: obyindaoquan
+    classID: 23
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.9
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: fx_ui_yindao
+    classID: 1
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.9
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: fx_ui_yindao/glow add
+    classID: 1
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.25
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.7
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: material._Alpha
+    path: obyindaoglow
+    classID: 23
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0.25
+        value: 707.505
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.7
+        value: 938.85913
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.x
+    path: obyindaoglow
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0.25
+        value: 707.505
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.7
+        value: 938.85913
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.y
+    path: obyindaoglow
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0.25
+        value: 707.505
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.7
+        value: 938.85913
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.z
+    path: obyindaoglow
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -0.00010325
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.7
+        value: -0.00012906
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.y
+    path: obyindaoglow
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
   m_EulerEditorCurves: []
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0

Assets/Scripts/GameData/ExcelConfig/DivineSenseConfig.cs

@@ -54,6 +54,11 @@ namespace Excel2Json
 #endif
 		
 
+
+
+
+
+
 	}
 
 }

Assets/Scripts/GameLogic/Combat/CombatState/CombatFightState.cs

@@ -62,7 +62,7 @@ namespace GameLogic.Combat.CombatState
             {
                 float add = 0.1f;
                 Vector3 pos = playerHeroEntity.dotPos;
-                Vector3 dir = CombatController.currActiveCombat.CombatHeroController.moveDir;
+                Vector3 dir = CombatController.currActiveCombat.CombatSenceController.moveDir;
                 float fx = 1;
 
                 pos += dir.normalized * CombatController.currActiveCombat.CombatHeroController.moveSpeed * t;

Assets/Scripts/GameLogic/Combat/CombatState/CombatSceneSwitchState.cs

@@ -81,7 +81,7 @@ namespace GameLogic.Combat.CombatState
 
             playerHeroEntity.combatHeroGameObject.SetPosition(pos);
             playerHeroEntity.GameObject.transform.rotation =
-                Quaternion.LookRotation(new Vector3(currDir.x, 0, currDir.z));
+                Quaternion.LookRotation(new Vector3(currDir.x, 0, currDir.z).normalized);
         }
 
         private async void InitScenes()

Assets/Scripts/GameLogic/Combat/CombatState/CombatUpdateState.cs

@@ -79,7 +79,7 @@ namespace GameLogic.Combat.CombatState
 
             float add = 0.1f;
             Vector3 pos = playerHeroEntity.dotPos;
-            Vector3 dir =  CombatController.currActiveCombat.CombatHeroController.moveDir;
+            Vector3 dir =  CombatController.currActiveCombat.CombatSenceController.moveDir;
             float fx = 1;
             
             pos += dir.normalized * CombatController.currActiveCombat.CombatHeroController.moveSpeed * t;

Assets/Scripts/GameLogic/Combat/CombatTool/CombatController.cs

@@ -7,6 +7,7 @@ using Core.State;
 using Core.Utility;
 using Excel2Json;
 using Fort23.Core;
+using Fort23.UTool;
 using GameLogic.Combat.CombatGuide;
 using GameLogic.Combat.CombatState;
 using GameLogic.Combat.CombatTool.CombatReport;
@@ -16,6 +17,7 @@ using GameLogic.Combat.Hero.HeroGPU;
 using GameLogic.CombatScenesTool;
 using UnityEngine;
 using Utility.CustomizeTimeLogic.FxLogic.TimeLineEvent;
+using Utility.UITool;
 using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
 using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic;
 
@@ -59,8 +61,7 @@ namespace GameLogic.Combat.CombatTool
 
         public CombatHeroEntity playerHeroEntity;
         public bool isWin;
-
-
+     
         public CombatStateBasic CurrState
         {
             get { return stateControl.CurrIState as CombatStateBasic; }
@@ -140,7 +141,7 @@ namespace GameLogic.Combat.CombatTool
         {
             stateControl.ChangeState(name);
         }
-
+      
         public void Update(float t)
         {
             CombatGestureController.Instance.Update();
@@ -154,7 +155,10 @@ namespace GameLogic.Combat.CombatTool
             {
                ChangeState("sceneSwitch");
             }
-
+            if (Input.GetKeyDown(KeyCode.D))
+            {
+               CombatSenceController.Flight(2, -90, 10);
+            }
          
             
             t *= speed;
@@ -189,6 +193,7 @@ namespace GameLogic.Combat.CombatTool
                     }
                 }
             }
+          
            
         }
 

Assets/Scripts/GameLogic/Combat/CombatTool/CombatHeroController.cs

@@ -26,7 +26,7 @@ namespace GameLogic.Combat.CombatTool
         private BetterList<CombatHeroEntity> heroDispose = new BetterList<CombatHeroEntity>();
 
         // public CombatHeroEntity playerHeroEntity;
-        public Vector3 moveDir = Vector3.forward;
+        
         public float moveSpeed = 2f;
         public bool isFlight;
         private bool _isFlightCameraFinish;
@@ -117,15 +117,7 @@ namespace GameLogic.Combat.CombatTool
             combatHeroEntity.HeroResurrection();
         }
 
-        public Vector3 GetTarget(float d)
-        {
-            if (CombatController.currActiveCombat.playerHeroEntity == null)
-            {
-                return new Vector3(0, 20, 0);
-            }
-
-            return CombatController.currActiveCombat.playerHeroEntity.dotPos + moveDir * d;
-        }
+      
 
         public void Update(float t)
         {
@@ -147,30 +139,7 @@ namespace GameLogic.Combat.CombatTool
                 heroDie[i].Update(t);
             }
 
-            if (isFlight)
-            {
-                _flightCurrTime += t * _flightAddTime;
-                moveDir = Vector3.Lerp(_flightStartDir, _flightDir, _flightCurrTime);
-                float flightSpeedCur =
-                    AnimationCurveManager.Instance.AnimationCurveLibrary.flightSpeedCurve.Evaluate(_flightCurrTime);
-                moveSpeed = Mathf.Lerp(_flightStartSpeed, _flightSpeed, flightSpeedCur);
-                if (_flightCurrTime > 0.95f&&!_isFlightCameraFinish)
-                {
-                    _isFlightCameraFinish= true;
-                    CombatController.currActiveCombat.CombatCameraControllder.SetFieldOfView(70, 1);
-                }
-
-                if (_flightCurrTime >= 1)
-                {
-                    moveDir = _flightDir;
-                    isFlight = false;
-                    moveSpeed = 2;
-                    GObjectPool.Instance.Recycle(_flightFx1);
-                    GObjectPool.Instance.Recycle(_flightFx2);
-                    
-                    CombatController.currActiveCombat.playerHeroEntity.PlayAnim("idle", true, 0, false, 1);
-                }
-            }
+         
         }
 
         public void LateUpdate(float t)
@@ -189,38 +158,7 @@ namespace GameLogic.Combat.CombatTool
             }
         }
 
-        public async CTask Flight(float time, float jiaoDu, float speed)
-        {
-            _flightCurrTime = 0;
-            _flightTime = time;
-            _flightAddTime = 1.0f / time;
-            isFlight = true;
-            _isFlightCameraFinish = false;
-            Quaternion quaternion = Quaternion.Euler(0, jiaoDu, 0);
-            _flightDir = quaternion * moveDir;
-            _flightStartDir = moveDir;
-            _flightStartSpeed = moveSpeed;
-            _flightSpeed = speed;
-            CombatController.currActiveCombat.playerHeroEntity.PlayAnim("idle2", true, 0, false, 1);
-            CombatController.currActiveCombat.CombatCameraControllder.SetFieldOfView(90, 0.5f);
-            GObjectPool.Instance.Recycle(_flightFx1);
-            GObjectPool.Instance.Recycle(_flightFx2);
-            GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx fly qi", delegate(ParticleSystemPool pool)
-            {
-                _flightFx1 = pool;
-                SpecialDotInfo specialDotInfo =
-                    CombatController.currActiveCombat.playerHeroEntity.GetSpecialDotInfo("hitpos");
-                pool.own.transform.SetParent(specialDotInfo.targetTran);
-                pool.own.transform.localPosition = Vector3.zero;
-            });
-            GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx zq jian loop", delegate(ParticleSystemPool pool)
-            {
-                _flightFx2 = pool;
-
-                pool.own.transform.SetParent(CombatController.currActiveCombat.playerHeroEntity.GameObject.transform);
-                pool.own.transform.localPosition = Vector3.zero;
-            });
-        }
+     
 
         public void AddHeroDie(CombatHeroEntity hero)
         {

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

@@ -8,6 +8,7 @@ using Fort23.UTool;
 using GameLogic.Combat.CombatTool.SceneTool;
 using GameLogic.CombatScenesTool;
 using UnityEngine;
+using Utility.UITool;
 using Random = UnityEngine.Random;
 
 namespace GameLogic.Combat.CombatTool
@@ -46,6 +47,21 @@ namespace GameLogic.Combat.CombatTool
 
         private float shengShiRan;
 
+        
+        public float moveSpeed = 2f;
+        public bool isFlight;
+        private bool _isFlightCameraFinish;
+        private float _flightTime;
+        private float _flightAddTime;
+        private float _flightCurrTime;
+        private Vector3 _flightDir;
+        private Vector3 _flightStartDir;
+        private float _flightStartSpeed;
+        private float _flightSpeed;
+        private ParticleSystemPool _flightFx1;
+        private ParticleSystemPool _flightFx2;
+        public Vector3 moveDir = Vector3.forward;
+
         // private List
         public async CTask InitScenes(string sceneName)
         {
@@ -103,6 +119,49 @@ namespace GameLogic.Combat.CombatTool
             SceneMonoConfig.UpdateScene();
         }
 
+        
+        public Vector3 GetTarget(float d)
+        {
+            if (CombatController.currActiveCombat.playerHeroEntity == null)
+            {
+                return new Vector3(0, 20, 0);
+            }
+
+            return CombatController.currActiveCombat.playerHeroEntity.dotPos + moveDir * d;
+        }
+        public async CTask Flight(float time, float jiaoDu, float speed)
+        {
+            _flightCurrTime = 0;
+            _flightTime = time;
+            _flightAddTime = 1.0f / time;
+            isFlight = true;
+            _isFlightCameraFinish = false;
+            Quaternion quaternion = Quaternion.Euler(0, jiaoDu, 0);
+            _flightDir = quaternion * moveDir;
+            _flightStartDir = moveDir;
+            _flightStartSpeed = moveSpeed;
+            _flightSpeed = speed;
+            CombatController.currActiveCombat.playerHeroEntity.PlayAnim("idle2", true, 0, false, 1);
+            CombatController.currActiveCombat.CombatCameraControllder.SetFieldOfView(90, 0.5f);
+            GObjectPool.Instance.Recycle(_flightFx1);
+            GObjectPool.Instance.Recycle(_flightFx2);
+            GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx fly qi", delegate(ParticleSystemPool pool)
+            {
+                _flightFx1 = pool;
+                SpecialDotInfo specialDotInfo =
+                    CombatController.currActiveCombat.playerHeroEntity.GetSpecialDotInfo("hitpos");
+                pool.own.transform.SetParent(specialDotInfo.targetTran);
+                pool.own.transform.localPosition = Vector3.zero;
+            });
+            GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx zq jian loop", delegate(ParticleSystemPool pool)
+            {
+                _flightFx2 = pool;
+
+                pool.own.transform.SetParent(CombatController.currActiveCombat.playerHeroEntity.GameObject.transform);
+                pool.own.transform.localPosition = Vector3.zero;
+            });
+        }
+        
         private async CTask<SceneDecoration> GetSceneDecoration(SceneObjectConfig sceneObjectConfig)
         {
             GameObjectPool gameObjectPool = await sceneObjectConfig.GetNewPrefab();
@@ -130,7 +189,7 @@ namespace GameLogic.Combat.CombatTool
 
         public void Update(float t)
         {
-            moveRoot.transform.position = CombatController.currActiveCombat.CombatHeroController.GetTarget(0);
+            moveRoot.transform.position = GetTarget(0);
             SceneMonoConfig?.UpdateScene();
      
 
@@ -149,7 +208,30 @@ namespace GameLogic.Combat.CombatTool
                     _isUpdateShengShi = false;
                 }
             }
+            if (isFlight)
+            {
+                _flightCurrTime += t * _flightAddTime;
+                moveDir = Vector3.Lerp(_flightStartDir, _flightDir, _flightCurrTime);
+                float flightSpeedCur =
+                    AnimationCurveManager.Instance.AnimationCurveLibrary.flightSpeedCurve.Evaluate(_flightCurrTime);
+                moveSpeed = Mathf.Lerp(_flightStartSpeed, _flightSpeed, flightSpeedCur);
+                if (_flightCurrTime > 0.95f&&!_isFlightCameraFinish)
+                {
+                    _isFlightCameraFinish= true;
+                    CombatController.currActiveCombat.CombatCameraControllder.SetFieldOfView(70, 1);
+                }
 
+                if (_flightCurrTime >= 1)
+                {
+                    moveDir = _flightDir;
+                    isFlight = false;
+                    moveSpeed = 2;
+                    GObjectPool.Instance.Recycle(_flightFx1);
+                    GObjectPool.Instance.Recycle(_flightFx2);
+                    
+                    CombatController.currActiveCombat.playerHeroEntity.PlayAnim("idle", true, 0, false, 1);
+                }
+            }
        
         }
 

Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs

@@ -142,9 +142,9 @@ namespace GameLogic.Combat.CombatType
             _currBoChi += 1;
 
             Vector3 startPos =
-                CombatController.currActiveCombat.CombatHeroController.GetTarget(20) + new Vector3(0, 1, 0);
+                CombatController.currActiveCombat.CombatSenceController.GetTarget(20) + new Vector3(0, 1, 0);
             Vector3 startPos2 =
-                CombatController.currActiveCombat.CombatHeroController.GetTarget(21) + new Vector3(0, 1, 0);
+                CombatController.currActiveCombat.CombatSenceController.GetTarget(21) + new Vector3(0, 1, 0);
             Vector3 dir = startPos2 - startPos;
             Quaternion quaternion = Quaternion.LookRotation(dir);
 
@@ -204,7 +204,7 @@ namespace GameLogic.Combat.CombatType
             {
                 
 
-                Vector3 heroPoint = CombatController.currActiveCombat.CombatHeroController.GetTarget(0);
+                Vector3 heroPoint = CombatController.currActiveCombat.CombatSenceController.GetTarget(0);
                 CombatController.currActiveCombat.MagicWeaponCombatSence.SetMagicWeaponCombatSence(heroPoint,
                     Vector3.forward);
                 Vector3 pos = heroPoint;

Assets/Scripts/GameLogic/Combat/CombatType/TestCombatType.cs

@@ -96,9 +96,9 @@ namespace GameLogic.Combat.CombatType
 
 
             Vector3 startPos =
-                CombatController.currActiveCombat.CombatHeroController.GetTarget(20) + new Vector3(0, 1, 0);
+                CombatController.currActiveCombat.CombatSenceController.GetTarget(20) + new Vector3(0, 1, 0);
             Vector3 startPos2 =
-                CombatController.currActiveCombat.CombatHeroController.GetTarget(21) + new Vector3(0, 1, 0);
+                CombatController.currActiveCombat.CombatSenceController.GetTarget(21) + new Vector3(0, 1, 0);
             Vector3 dir = startPos2 - startPos;
             Quaternion quaternion = Quaternion.LookRotation(dir);
 
@@ -177,9 +177,9 @@ namespace GameLogic.Combat.CombatType
             _currBoChi += 1;
 
             Vector3 startPos =
-                CombatController.currActiveCombat.CombatHeroController.GetTarget(20) + new Vector3(0, 1, 0);
+                CombatController.currActiveCombat.CombatSenceController.GetTarget(20) + new Vector3(0, 1, 0);
             Vector3 startPos2 =
-                CombatController.currActiveCombat.CombatHeroController.GetTarget(21) + new Vector3(0, 1, 0);
+                CombatController.currActiveCombat.CombatSenceController.GetTarget(21) + new Vector3(0, 1, 0);
             Vector3 dir = startPos2 - startPos;
             Quaternion quaternion = Quaternion.LookRotation(dir);
             for (int i = 0; i < enemyHeroInfo.Count; i++)
@@ -217,7 +217,7 @@ namespace GameLogic.Combat.CombatType
 
         private async CTask TestCombat(CTaskAwaitBuffer cTaskAwaitBuffer)
         {
-            Vector3 heroPoint = CombatController.currActiveCombat.CombatHeroController.GetTarget(0);
+            Vector3 heroPoint = CombatController.currActiveCombat.CombatSenceController.GetTarget(0);
             CombatController.currActiveCombat.MagicWeaponCombatSence.SetMagicWeaponCombatSence(heroPoint,
                 Vector3.forward);
             testCombatHeroConfig = GameObject.FindObjectOfType<TestCombatHeroConfig>();

Assets/Scripts/GameUI/EventManager/DialogueManager.cs

@@ -119,7 +119,7 @@ public class DialogueManager : Singleton<DialogueManager>
         {
             UIManager.Instance.HindCurrAllShowPanel();
             CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
-            CombatController.currActiveCombat.CombatHeroController.Flight(dialogueConfig.PreShowPar, -90, 10);
+            CombatController.currActiveCombat.CombatSenceController.Flight(dialogueConfig.PreShowPar, -90, 10);
             UIManager.Instance.SetEventSystemEnable(false);
             await TimerComponent.Instance.WaitAsync(dialogueConfig.PreShowPar * 1000 + 1200);
             CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);