提交结算

UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_弹窗.spriteatlas

@@ -76,6 +76,9 @@ SpriteAtlas:
     - {fileID: 21300000, guid: 0f15acdd90c87fe47beedadca47e7010, type: 3}
     - {fileID: 21300000, guid: 3b8788a5800321a4498485a85c170fc0, type: 3}
     - {fileID: 21300000, guid: af50fc7eee516a645b09aa8f79017aaa, type: 3}
+    - {fileID: 21300000, guid: d2ee8cbf34c48214688c60c2fadf0e8e, type: 3}
+    - {fileID: 21300000, guid: 464e18bfd9c3d5e4b927c13ec9def492, type: 3}
+    - {fileID: 21300000, guid: 9c5e0e9bd6ee88c4597788568c620662, type: 3}
     - {fileID: 21300000, guid: d54d40edf100af147a5223de2f881ca3, type: 3}
     - {fileID: 21300000, guid: 321bf3fcbdc862a46bc384367d7fbe90, type: 3}
     - {fileID: 21300000, guid: dfa5081d38f50174ca827e79d87b24f7, type: 3}
@@ -85,43 +88,10 @@ SpriteAtlas:
     bindAsDefault: 1
     isAtlasV2: 0
     cachedData: {fileID: 0}
-    packedSpriteRenderDataKeys:
+    packedSpriteRenderDataKeys: []
-    - e2f0e310f699dd1499e93cb07a0a3198: 21300000
-    - a8460773c27a29748bbadcdc333e57aa: 21300000
-    - 3b8788a5800321a4498485a85c170fc0: 21300000
-    - 1ae1cec5530a6cd44b0d31ea027ebcf1: 21300000
-    - e7f5460757eef7c409168510aa3c5037: 21300000
-    - 2cfbfa89505825949b3cec3b48d323a6: 21300000
-    - 321bf3fcbdc862a46bc384367d7fbe90: 21300000
-    - dfa5081d38f50174ca827e79d87b24f7: 21300000
-    - 0f15acdd90c87fe47beedadca47e7010: 21300000
-    - d54d40edf100af147a5223de2f881ca3: 21300000
-    - af50fc7eee516a645b09aa8f79017aaa: 21300000
   m_MasterAtlas: {fileID: 0}
-  m_PackedSprites:
+  m_PackedSprites: []
-  - {fileID: 21300000, guid: e2f0e310f699dd1499e93cb07a0a3198, type: 3}
+  m_PackedSpriteNamesToIndex: []
-  - {fileID: 21300000, guid: a8460773c27a29748bbadcdc333e57aa, type: 3}
-  - {fileID: 21300000, guid: 3b8788a5800321a4498485a85c170fc0, type: 3}
-  - {fileID: 21300000, guid: 1ae1cec5530a6cd44b0d31ea027ebcf1, type: 3}
-  - {fileID: 21300000, guid: e7f5460757eef7c409168510aa3c5037, type: 3}
-  - {fileID: 21300000, guid: 2cfbfa89505825949b3cec3b48d323a6, type: 3}
-  - {fileID: 21300000, guid: 321bf3fcbdc862a46bc384367d7fbe90, type: 3}
-  - {fileID: 21300000, guid: dfa5081d38f50174ca827e79d87b24f7, type: 3}
-  - {fileID: 21300000, guid: 0f15acdd90c87fe47beedadca47e7010, type: 3}
-  - {fileID: 21300000, guid: d54d40edf100af147a5223de2f881ca3, type: 3}
-  - {fileID: 21300000, guid: af50fc7eee516a645b09aa8f79017aaa, type: 3}
-  m_PackedSpriteNamesToIndex:
-  - xs_k
-  - "\u4E3B\u754C\u9762\u2014\u73B0\u4EE3"
-  - MC
-  - DZ_icon
-  - GJSK
-  - qz_jr
-  - gx
-  - gx_2
-  - LWTC_d_box
-  - TXK
-  - MC_jr
   m_RenderDataMap: {}
   m_Tag: "UIRaw_Atlas_\u5F39\u7A97"
   m_IsVariant: 0

UnityProject/Assets/AssetRaw/UI/UIGameEndForm.prefab.meta

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

UnityProject/Assets/AssetRaw/UI/UIGameRankForm.prefab

@@ -1669,7 +1669,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 182721815195331612}
-  - {fileID: 8433223204352847102}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -3450,81 +3449,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &5908539668618577435
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8433223204352847102}
-  - component: {fileID: 1445692795228327223}
-  - component: {fileID: 4235874710465494432}
-  m_Layer: 5
-  m_Name: Image
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &8433223204352847102
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5908539668618577435}
-  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: 2338385386102721414}
-  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: -1.625, y: 0}
-  m_SizeDelta: {x: 602.25, y: 1080}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1445692795228327223
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5908539668618577435}
-  m_CullTransparentMesh: 1
---- !u!114 &4235874710465494432
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5908539668618577435}
-  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: 1, g: 1, b: 1, a: 0.3137255}
-  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: f0c3ad72d8f55fd49963194fe6629c74, 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!1 &5956216414497448519
 GameObject:
   m_ObjectHideFlags: 0

UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs

@@ -498,7 +498,10 @@ namespace GameLogic
                     m_Buff1.m_EffectGo = eGo;
 
                     // 移动特效
-                    eGo.transform.DOLocalMove(Vector3.zero, 1.5f);
+                    eGo.transform.DOLocalMove(Vector3.zero, 1.5f).OnComplete(() =>
+                    {
+
+                    });
 
                 }
             }