Merge branch 'feature/newWork' of http://git.wzaxr.top/5.24BuYu into feature/newWork

Assets/Framework/Tool/RedPacket/LayeredRedPacket.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 
+[Serializable]
 /// <summary>
 /// 纯整数红包记录
 /// 金额单位：分 (int)

Assets/MyGame/Scripts/Characters/Monster/MonsterContral.cs

@@ -34,6 +34,7 @@ public class MonsterContral : MonoBehaviour
     public string forwordXYZ;
     protected RectTransform uirootRect;
     protected Camera mainCamera;
+    public FishTypeEnum fishenum;
     public virtual void DieFish(RoomKillNotice obj =null)
     {
         Destroy(gameObject);
@@ -89,10 +90,12 @@ public class MonsterContral : MonoBehaviour
                 default:
                     break;
             }
-        switch ((FishTypeEnum)monsterData.fishTypeConfig.fishType)
+        fishenum = (FishTypeEnum)monsterData.fishTypeConfig.fishType;
+        switch (fishenum)
         {
             case FishTypeEnum.普通鱼:
                 Destroy(gameObject, Time);
+                
                 break;
             case FishTypeEnum.Boss鱼:
                 Destroy(gameObject, Time);

Assets/MyGame/Scripts/Manager/CreateFishManager.cs

@@ -13,10 +13,12 @@ using System.Drawing;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Threading;
+using TMPro;
 using Unity.Collections;
 using Unity.Jobs;
 using UnityEditor;
 using UnityEngine;
+using static UnityEditor.Progress;
 using Random = UnityEngine.Random;
 
 public class CreateFishManager : MonoSingleton<CreateFishManager>
@@ -918,7 +920,7 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
     /// </summary>
     /// <param name="count"></param>
     /// <returns></returns>
-    public List<string> SyncGameData_SendRendromDieFishID(int count,List<RedPacketRecord> coinNum=null)
+    public List<string> SyncGameData_SendRendromDieFishID(int count,List<RedPacketRecord> coinNum)
     {
 
 
@@ -957,6 +959,7 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
                 frameData = new FrameData_RandomDieFish
                 {
                     guids = list,
+                    coinNum= coinNum,
                     count = count
                 }
             };
@@ -976,7 +979,7 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
             fishDatas_hashCodekey.Remove(fishId);
         }
     }
-    public void Id_DieFish_FX(string fishId)
+    public void Id_DieFish_FX(string fishId, RedPacketRecord coinNum)
     {
         if (fishDatas_hashCodekey.ContainsKey(fishId))
         {
@@ -984,8 +987,14 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
             var monster = fishDatas_hashCodekey[fishId];
             Instantiate(monster.effect_Die == null ? dieFXPrefab : monster.effect_Die, monster.transform.position, Quaternion.identity, transform.parent);
             //award效果
-             //Instantiate(monster.effect_DieAward == null ? dieFXPrefabAward : monster.effect_DieAward, monster.transform.position, Quaternion.identity, transform.parent);
+            
+            if (monster.effect_DieAward == null && monster.fishenum != FishTypeEnum.Boss鱼)
+            {
+                var award = Instantiate(monster.effect_DieAward == null ? dieFXPrefabAward : monster.effect_DieAward, currGameType.subPanelParent.parent);
+                award.GetComponent<RectTransform>().anchoredPosition =CoordinateTransformation.WorldPos_ToCanvas(monster.transform.position, UIManager.Instance.uiRoot.GetComponent<Canvas>());
+                award.transform.GetChild(2).GetComponent<TextMeshProUGUI>().text = coinNum.Amount.ToString();
 
+            }
 
             MonsterDieList.Instance.SmallHuangYiHuang(monster.transform.position, monster.monsterData.fishTypeConfig.fishNumber, 1000);
             //Destroy(monster.gameObject);
@@ -1009,11 +1018,11 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
         }
     }
 
-    public void Id_DieListFish_FX(List<string> ids)
+    public void Id_DieListFish_FX(List<string> ids, List<RedPacketRecord> coinNum)
     {
-        foreach (var item in ids)
-        {
-            Id_DieFish_FX(item);
+        for (int i = 0; i < ids.Count; i++) {
+
+            Id_DieFish_FX(ids[i], coinNum[i]);
         }
     }
 
@@ -1026,6 +1035,14 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
             AudioManager.Instance.PlayerFX(60004);
             var monster = fishDatas_hashCodekey[killFish.fishId];
             Instantiate(monster.effect_Die == null ? dieFXPrefab : monster.effect_Die, monster.transform.position, Quaternion.identity, transform.parent);
+            if (monster.effect_DieAward == null&& monster.fishenum != FishTypeEnum.Boss鱼)
+            {
+                var award = Instantiate(monster.effect_DieAward == null ? dieFXPrefabAward : monster.effect_DieAward, currGameType.subPanelParent.parent);
+                award.GetComponent<RectTransform>().anchoredPosition = CoordinateTransformation.WorldPos_ToCanvas(monster.transform.position, UIManager.Instance.uiRoot.GetComponent<Canvas>());
+                award.transform.GetChild(2).GetComponent<TextMeshProUGUI>().text = killFish.gold.ToString();
+
+            }
+
             MonsterDieList.Instance.SmallHuangYiHuang(monster.transform.position, monster.monsterData.fishTypeConfig.fishNumber, 1000);
             //Destroy(monster.gameObject);
             monster.DieFish(killFish);

Assets/MyGame/Scripts/Net/WebResponses/SyncGameData.cs

@@ -69,6 +69,7 @@ namespace Assets.MyGame.Scripts.Net.WebResponses
     public class FrameData_RandomDieFish : FrameData
     {
         public List<string> guids=new List<string>();
+        public List<RedPacketRecord> coinNum=new List<RedPacketRecord>();
         public int count;
     }
 }

Assets/MyGame/aa/Game/DefaultDieEffect/Coin.prefab

@@ -11,6 +11,7 @@ GameObject:
   - component: {fileID: 3252193072664515267}
   - component: {fileID: 7617333372803733935}
   - component: {fileID: 2327506323784387051}
+  - component: {fileID: 8948124406826948487}
   m_Layer: 5
   m_Name: Gold
   m_TagString: Untagged
@@ -30,9 +31,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 8483020304666188488}
   - {fileID: 6250418086618249309}
-  - {fileID: 4465188864695660331}
   m_Father: {fileID: 8802702133347106559}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -74,6 +73,27 @@ MonoBehaviour:
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
   m_ReverseArrangement: 0
+--- !u!95 &8948124406826948487
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 261762419476206530}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 511c4432221009540948656fcedd6d1e, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!1 &2042861085145573955
 GameObject:
   m_ObjectHideFlags: 0
@@ -148,103 +168,6 @@ MonoBehaviour:
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
   m_ReverseArrangement: 0
---- !u!1 &2443245076198457152
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8483020304666188488}
-  - component: {fileID: 5383677614806708653}
-  - component: {fileID: 9202937367292815458}
-  - component: {fileID: 4914361613895260971}
-  m_Layer: 5
-  m_Name: Image (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &8483020304666188488
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2443245076198457152}
-  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: 3252193072664515267}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5383677614806708653
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2443245076198457152}
-  m_CullTransparentMesh: 1
---- !u!114 &9202937367292815458
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2443245076198457152}
-  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: 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: 4f84a65ffddb6cc43a280cab2ed65ca2, 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!95 &4914361613895260971
-Animator:
-  serializedVersion: 5
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2443245076198457152}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: b5d7feff55f4f7645b9ae1236893c22a, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_StabilizeFeet: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
 --- !u!1 &2538281198944851063
 GameObject:
   m_ObjectHideFlags: 0
@@ -574,103 +497,6 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!1 &6056614213250948318
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4465188864695660331}
-  - component: {fileID: 6363753840655695582}
-  - component: {fileID: 5185258263883177097}
-  - component: {fileID: 5414845909783628702}
-  m_Layer: 5
-  m_Name: Image (3)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &4465188864695660331
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6056614213250948318}
-  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: 3252193072664515267}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6363753840655695582
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6056614213250948318}
-  m_CullTransparentMesh: 1
---- !u!114 &5185258263883177097
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6056614213250948318}
-  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: 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: 4f84a65ffddb6cc43a280cab2ed65ca2, 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!95 &5414845909783628702
-Animator:
-  serializedVersion: 5
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6056614213250948318}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: b5d7feff55f4f7645b9ae1236893c22a, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_StabilizeFeet: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
 --- !u!1 &8222732459988217625
 GameObject:
   m_ObjectHideFlags: 0
@@ -697,8 +523,8 @@ RectTransform:
   m_GameObject: {fileID: 8222732459988217625}
   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_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 3252193072664515267}
   - {fileID: 4141654619161611748}
@@ -735,7 +561,7 @@ GameObject:
   - component: {fileID: 8869491853869306038}
   - component: {fileID: 4880642512375020130}
   m_Layer: 5
-  m_Name: Image (2)
+  m_Name: Coin
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -758,7 +584,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
+  m_SizeDelta: {x: 80, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4330466387219907929
 CanvasRenderer:

Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs

@@ -651,7 +651,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
     {
         
             var fireBullet = JsonConvert.DeserializeObject<FrameData_RandomDieFish>(syncGameData.frameData.ToString());
-            CreateFishManager.Instance.Id_DieListFish_FX(fireBullet.guids);
+            CreateFishManager.Instance.Id_DieListFish_FX(fireBullet.guids, fireBullet.coinNum);
         
     }