Browse Source

Merge branch 'master' of http://fort23.cn:3000/ck/XiuXianGame

LT 3 tuần trước cách đây
mục cha
commit
e06bb1e61d

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/Art/UIAssets/TextrueJson/bg.txt


BIN
Assets/Art/UIAssets/bg/bg_logo.png


BIN
Assets/Art/UIAssets/bg/bg_zairu.png


BIN
Assets/Art/UIAssets/decorate/dec_fengling.png


+ 3 - 3
Assets/Res/Config/LanguageChineseConfig.json

@@ -2790,7 +2790,7 @@
     },
     {
       "ID": 698,
-      "txt": "玄黄道"
+      "txt": "玄黄道 "
     },
     {
       "ID": 699,
@@ -2802,7 +2802,7 @@
     },
     {
       "ID": 701,
-      "txt": "每次使用功法时在当前位置留下一道属性印记,下一个放上来的功法如果和以前功法相生则功法效果提升{0}%,每次使用功法时都会治疗对应相生属性的{1}伤势。(均衡性功法搭配,转盘改变,变为金、水、木、火、土)"
+      "txt": "每次使用功法时在当前位置留下一道属性印记,下一个放上来的功法如果和以前功法相生则功法效果提升{0}%,每次使用功法时都会治疗对应相生属性的{1}伤势。(均衡性功法搭配,转盘改变,变为金、水、木、火、土)\n"
     },
     {
       "ID": 702,
@@ -38198,7 +38198,7 @@
     },
     {
       "ID": 10290,
-      "txt": "心情+{0}"
+      "txt": "心情+{0} "
     },
     {
       "ID": 10291,

+ 19 - 19
Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab

@@ -5180,7 +5180,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1334}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:
@@ -6389,27 +6389,27 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 795566806128681732, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_AnchorMax.x
-      value: 1
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 795566806128681732, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 795566806128681732, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_AnchorMin.x
-      value: 0
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 795566806128681732, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 795566806128681732, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 650
+      value: 750
       objectReference: {fileID: 0}
     - target: {fileID: 795566806128681732, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 1524
+      value: 1624
       objectReference: {fileID: 0}
     - target: {fileID: 1168641042236661909, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_LocalScale.x
@@ -6461,27 +6461,27 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2192126879010274111, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_AnchorMax.x
-      value: 1
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 2192126879010274111, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 2192126879010274111, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_AnchorMin.x
-      value: 0
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 2192126879010274111, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 2192126879010274111, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 1340
+      value: 1440
       objectReference: {fileID: 0}
     - target: {fileID: 2192126879010274111, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 2460
+      value: 2850
       objectReference: {fileID: 0}
     - target: {fileID: 2733326372389011073, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_IsActive
@@ -6581,27 +6581,27 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8012369844007230167, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_AnchorMax.x
-      value: 1
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 8012369844007230167, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 8012369844007230167, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_AnchorMin.x
-      value: 0
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 8012369844007230167, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 8012369844007230167, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 1340
+      value: 1440
       objectReference: {fileID: 0}
     - target: {fileID: 8012369844007230167, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 2460
+      value: 2850
       objectReference: {fileID: 0}
     - target: {fileID: 8032426126026463688, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_Pivot.x

+ 3 - 3
Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -522,7 +522,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -7.299959, y: -51.500004}
-  m_SizeDelta: {x: 51, y: 118}
+  m_SizeDelta: {x: 51, y: 68}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &778206244950053257
 CanvasRenderer:
@@ -1929,7 +1929,7 @@ MonoBehaviour:
     m_Right: 0
     m_Top: 0
     m_Bottom: 0
-  m_ChildAlignment: 1
+  m_ChildAlignment: 0
   m_Spacing: -13.03
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
@@ -4474,7 +4474,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 1500, y: 3248}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

+ 1 - 1
Assets/Res/UI/XianTuLogPanel/EventLogInfoWidget.prefab

@@ -36,7 +36,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 252.36674, y: -63.5}
+  m_AnchoredPosition: {x: 252.36674, y: -45}
   m_SizeDelta: {x: 334.7335, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8146511189872025584

+ 1 - 1
Assets/Res/UI/XianTuLogPanel/EventMinLogWidget.prefab

@@ -427,7 +427,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 38.6, y: 0.000078678}
-  m_SizeDelta: {x: 160, y: 38.428}
+  m_SizeDelta: {x: 363.4877, y: 38.428}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &9076508543581580122
 CanvasRenderer:

+ 1 - 1
Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat

@@ -66,5 +66,5 @@ Material:
     m_Colors:
     - _mainColor: {r: 0.21314356, g: 1.4060051, b: 2.1517377, a: 0}
     - _off: {r: 0.01, g: 0.01, b: 0, a: 0}
-    - _pos: {r: 0, g: -5, b: -30, a: 0}
+    - _pos: {r: -1.8000001, g: -5.3999996, b: -30, a: 0}
   m_BuildTextureStacks: []

+ 416 - 37
Assets/Scenes/testCombat.scene

@@ -571,14 +571,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 445
-      y: 1468
+      x: 690
+      y: 1408
       width: 28
       height: 29
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 445, y: 1468}
+    atlasRectOffset: {x: 690, y: 1408}
     settingsRaw: 67
-    uvTransform: {x: 100, y: 459, z: 100, w: 1482.5}
+    uvTransform: {x: 100, y: 704, z: 100, w: 1422.5}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: -0.14, y: 0.145}
@@ -639,6 +639,7 @@ Transform:
   m_Children:
   - {fileID: 753442136}
   - {fileID: 168908852}
+  - {fileID: 1831378552}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &123020046
@@ -1046,6 +1047,7 @@ GameObject:
   - component: {fileID: 442218247}
   - component: {fileID: 442218249}
   - component: {fileID: 442218248}
+  - component: {fileID: 442218250}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Fill
@@ -1065,13 +1067,14 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 1296517489}
   m_Father: {fileID: 1080868192}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 5.334717, y: 0.34000206}
-  m_SizeDelta: {x: 9.730537, y: -8.419997}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &442218248
 MonoBehaviour:
@@ -1086,14 +1089,14 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.41176474, g: 0.5294118, b: 0.6313726, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 26d89dd2d7ae148e4acefd7fb973eb82, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1111,6 +1114,19 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 442218246}
   m_CullTransparentMesh: 1
+--- !u!114 &442218250
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 442218246}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 1
 --- !u!1 &753442135
 GameObject:
   m_ObjectHideFlags: 0
@@ -1228,7 +1244,6 @@ GameObject:
   - component: {fileID: 773560729}
   - component: {fileID: 773560732}
   - component: {fileID: 773560731}
-  - component: {fileID: 773560733}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1253,7 +1268,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 185}
+  m_AnchoredPosition: {x: 0, y: 129.9}
   m_SizeDelta: {x: 660.2, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &773560731
@@ -1277,8 +1292,8 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 28
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 30
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
@@ -1298,22 +1313,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 773560728}
   m_CullTransparentMesh: 1
---- !u!114 &773560733
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 773560728}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  effectColor: {r: 0.9622642, g: 0.24964403, b: 0.24964403, a: 1}
-  effectDistanceX: 2
-  effectDistanceY: 2
-  samplingRate: 8
 --- !u!1 &846380789
 GameObject:
   m_ObjectHideFlags: 0
@@ -1349,8 +1348,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 5, y: -245}
-  m_SizeDelta: {x: 548, y: 490}
+  m_AnchoredPosition: {x: 5, y: -216}
+  m_SizeDelta: {x: 497, y: 313}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &846380791
 MonoBehaviour:
@@ -1649,8 +1648,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.25}
   m_AnchorMax: {x: 1, y: 0.75}
-  m_AnchoredPosition: {x: -5, y: 0}
-  m_SizeDelta: {x: -20, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -6.0000024, y: -6}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1001 &1131043597
 PrefabInstance:
@@ -1929,6 +1928,82 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
+--- !u!1 &1296517488
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1296517489}
+  - component: {fileID: 1296517491}
+  - component: {fileID: 1296517490}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1296517489
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1296517488}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 442218247}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -0.000030517578, y: 0.00001}
+  m_SizeDelta: {x: 211.6228, y: 40}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!114 &1296517490
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1296517488}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.47058827, g: 0.6627451, b: 0.82745105, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: c0c46614f24bc234b92e828eae8336c3, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1296517491
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1296517488}
+  m_CullTransparentMesh: 1
 --- !u!1 &1312762638
 GameObject:
   m_ObjectHideFlags: 0
@@ -1980,14 +2055,14 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.15686275, g: 0.14901961, b: 0.12941177, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 6332433fb34294d58bfc835736ee8ac3, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2041,8 +2116,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 127}
-  m_SizeDelta: {x: 660.2, y: 122.30005}
+  m_AnchoredPosition: {x: 0, y: 70.58594}
+  m_SizeDelta: {x: 699.8201, y: 66.6589}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1324294698
 MonoBehaviour:
@@ -2457,6 +2532,310 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 7091770935250694576, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
   m_PrefabInstance: {fileID: 1733556487}
   m_PrefabAsset: {fileID: 0}
+--- !u!213 &1811187060
+Sprite:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: dec_jianbian_tiao(Clone)
+  m_Rect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 115
+    height: 33
+  m_Offset: {x: 0, y: 0}
+  m_Border: {x: 0, y: 0, z: 0, w: 0}
+  m_PixelsToUnits: 100
+  m_Pivot: {x: 0.5, y: 0.5}
+  m_Extrude: 1
+  m_IsPolygon: 0
+  m_AtlasName: 
+  m_PackingTag: 
+  m_RenderDataKey:
+    c0c46614f24bc234b92e828eae8336c3: 21300000
+  m_AtlasTags:
+  - tongyong
+  m_SpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  m_RD:
+    serializedVersion: 3
+    texture: {fileID: 2800000, guid: c0c46614f24bc234b92e828eae8336c3, type: 3}
+    alphaTexture: {fileID: 0}
+    secondaryTextures: []
+    m_SubMeshes:
+    - serializedVersion: 2
+      firstByte: 0
+      indexCount: 6
+      topology: 0
+      baseVertex: 0
+      firstVertex: 0
+      vertexCount: 4
+      localAABB:
+        m_Center: {x: 0, y: 0, z: 0}
+        m_Extent: {x: 0, y: 0, z: 0}
+    m_IndexBuffer: 030000000100020001000000
+    m_VertexData:
+      serializedVersion: 3
+      m_VertexCount: 4
+      m_Channels:
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 3
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 1
+        offset: 0
+        format: 0
+        dimension: 2
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      m_DataSize: 80
+      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
+    m_Bindpose: []
+    textureRect:
+      serializedVersion: 2
+      x: 0
+      y: 0
+      width: 115
+      height: 33
+    textureRectOffset: {x: 0, y: 0}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 57.5, z: 100, w: 16.5}
+    downscaleMultiplier: 1
+  m_AtlasRD:
+    serializedVersion: 3
+    texture: {fileID: 8711939763936270973, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+    alphaTexture: {fileID: 0}
+    secondaryTextures: []
+    m_SubMeshes:
+    - serializedVersion: 2
+      firstByte: 0
+      indexCount: 6
+      topology: 0
+      baseVertex: 0
+      firstVertex: 0
+      vertexCount: 4
+      localAABB:
+        m_Center: {x: 0, y: 0, z: 0}
+        m_Extent: {x: 0, y: 0, z: 0}
+    m_IndexBuffer: 030000000100020001000000
+    m_VertexData:
+      serializedVersion: 3
+      m_VertexCount: 4
+      m_Channels:
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 3
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 1
+        offset: 0
+        format: 0
+        dimension: 2
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      m_DataSize: 80
+      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
+    m_Bindpose: []
+    textureRect:
+      serializedVersion: 2
+      x: 285
+      y: 1481
+      width: 115
+      height: 33
+    textureRectOffset: {x: 0, y: 0}
+    atlasRectOffset: {x: 285, y: 1481}
+    settingsRaw: 67
+    uvTransform: {x: 100, y: 342.5, z: 100, w: 1497.5}
+    downscaleMultiplier: 1
+  m_PhysicsShape:
+  - - {x: 0.345, y: 0.16499999}
+    - {x: 0.345, y: -0.16499999}
+    - {x: 0.575, y: -0.16499999}
+    - {x: 0.575, y: 0.16499999}
+  m_Bones: []
+  m_SpriteID: 5e97eb03825dee720800000000000000
+--- !u!1 &1831378551
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1831378552}
+  - component: {fileID: 1831378554}
+  - component: {fileID: 1831378553}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1831378552
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1831378551}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 123020045}
+  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!114 &1831378553
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1831378551}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 1811187060}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_jianbian_tiao
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 6f525d051e27c33e0699a302ce6a4b3d
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!222 &1831378554
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1831378551}
+  m_CullTransparentMesh: 1
 --- !u!114 &4237119297094294473
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 4 - 3
Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -65,6 +65,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
                 CeekEventGroupComplete(eventLinkData.eventConditions);
             }
         }
+
         StaticUpdater.Instance.AddRenderUpdateCallBack(Update);
         EventManager.Instance.AddEventListener(CustomEventType.DetectRandomEvent, RenfenceRandomEvent);
         EventManager.Instance.AddEventListener(CustomEventType.AddItem, ItemUpdate);
@@ -469,7 +470,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
             //场景特定事件
             List<EventConfig> candidateEvents = eventConfigs.Where(e =>
-                bigMap.SpecialTaskID.Contains(e.ID) && e.EventQuality == quality &&
+                e.EventQuality == quality &&
                 eventLists.FirstOrDefault(el => el.eventID == e.ID) == null && CanTriggerEvent(e.ID) &&
                 CanEventType(e.ID, itemInfoType2)).ToList();
 
@@ -482,7 +483,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
             int randomValue1 = Random.Range(0, 101);
             // 达到怪率刷新场景特定事件
             //不然刷新通用事件(每个地图都可以刷的)
-            if (randomValue1 >= bigMap.DivineSenseGeneralProbability && candidateEvents.Count > 0)
+            if (randomValue1 < bigMap.DivineSenseGeneralProbability && candidateEvents.Count > 0)
             {
                 int randomValue2 = Random.Range(0, candidateEvents.Count);
 
@@ -1039,7 +1040,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
                 case 3:
                     int randomValue1 = Random.Range(0, 1001);
 
-                    return randomValue1 <= evt.EventCount[i];
+                    return randomValue1 <= evt.EventValue[i];
                 //完成事件判断
                 case 10:
                     AccountFileInfo.EventList eventList =

BIN
Excel2Json/Excel/EventConfig.xlsx


BIN
Excel2Json/Excel/Language.xlsx


BIN
Excel2Json/Excel/Maps.xlsx


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
美术/unity_use_ui/TextrueJson/bg.txt


BIN
美术/unity_use_ui/bg/bg_logo.png


BIN
美术/unity_use_ui/bg/bg_zairu.png


BIN
美术/unity_use_ui/decorate/dec_fengling.png


Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác