Merge pull request '0530提交' (#124) from dev-0530-yjm into dev-1217

Reviewed-on: #124

ColorlessWorld-2024-4-2/Assets/GameDate/PlayerState.asset

@@ -13,18 +13,18 @@ MonoBehaviour:
   m_Name: PlayerState
   m_EditorClassIdentifier: 
   playerName: Julius
-  maxStepRange: 5
+  maxStepRange: 3
-  currentStepRange: 5
+  currentStepRange: 6
-  maxCost: 10
+  maxCost: 3
-  currentCost: 7
+  currentCost: 10
   maxShieldValue: 0
   currentShieldValue: 0
-  maxHP: 1000
+  maxHP: 10222
-  currentHP: 916
+  currentHP: 10222
   cardRewardNumToChoose: 0
   cardRewardNumToGget: 0
   canColorCount: 20
   castRange: 2
-  money: 10000
+  money: 10222
-  forgingPoint: 10000
+  forgingPoint: 10222
   priceMultiplier: 1

ColorlessWorld-2024-4-2/Assets/Plugins/Microsoft.CSharp.dll.meta

@@ -0,0 +1,27 @@
+fileFormatVersion: 2
+guid: a94cf6fef2879da4c91e5ef768aadf4e
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scenes/ChooseWeapon.unity

@@ -23950,20 +23950,7 @@ MonoBehaviour:
   - levelColumn: []
   - levelColumn: []
   - levelColumn: []
-  monsterIcon: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3}
+  roomBig: {x: 0, y: 0, z: 0}
-  eliteMonsterIcon: {fileID: 929432110, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3}
-  bossIcon: {fileID: 865203525, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3}
-  shopIcon: {fileID: 865446097, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3}
-  campfireIcon: {fileID: -1693594073, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3}
-  incidentIcon: {fileID: -687936468, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3}
-  treasureIcon: {fileID: 558621461, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3}
-  mosterBig: {x: 0.4, y: 0.4, z: 0.4}
-  eliteMosterBig: {x: 0.5, y: 0.5, z: 0.5}
-  shopBig: {x: 0.5, y: 0.5, z: 0.5}
-  incidentBig: {x: 0.45, y: 0.45, z: 0.45}
-  campfireBig: {x: 0.45, y: 0.45, z: 0.45}
-  bossBig: {x: 0.8, y: 0.8, z: 0.8}
-  treasureBig: {x: 0.4, y: 0.4, z: 0.4}
 --- !u!1 &1555142317
 GameObject:
   m_ObjectHideFlags: 0
@@ -24306,16 +24293,16 @@ MonoBehaviour:
     - 1001
   - cardGroupFathers: {fileID: 1514211913}
     cardIDGroup:
-    - 1002
+    - 1001
-    - 1002
+    - 1001
-    - 1002
+    - 1001
   - cardGroupFathers: {fileID: 1424524448}
     cardIDGroup:
-    - 1003
+    - 1001
-    - 1003
+    - 1001
   - cardGroupFathers: {fileID: 25128810}
     cardIDGroup:
-    - 2032
+    - 2002
     - 2001
   cardGroup_1: []
   cardGroup_2: []

ColorlessWorld-2024-4-2/Assets/Scripts/RewardCardPoint/CardAddManager.cs

@@ -1,3 +1,4 @@
+using Newtonsoft.Json;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
@@ -15,19 +16,24 @@ public class CardAddManager : Singleton<CardAddManager>
     public void GeneratorRewardCard(List<Transform> cardSlot)
     {
         List<string> cardAllList = CardOriginalDataList.Instance.cardOriginalDataList.Keys.ToList();
+        HashSet<string> dyeingCardSet = MathTool.GetRandomElements(CardManager.Instance.withoutBasicCard(CardOriginalDataList.Instance.cardOriginalDataList).Keys.ToHashSet(), 1);
+        HashSet<string> effectCardSet = MathTool.GetRandomElements(CardManager.Instance.withoutBasicCard(CardOriginalDataList.Instance.effectCardOriginalDataList).Keys.ToHashSet(), 1);
+        HashSet<string> allCardSet = JsonConvert.DeserializeObject<HashSet<string>>(JsonConvert.SerializeObject(CardOriginalDataList.Instance.allCardOriginalDataList.Keys.ToHashSet()));
+        allCardSet.Remove(dyeingCardSet.ElementAt(0));
+        allCardSet.Remove(effectCardSet.ElementAt(0));
+        HashSet<string> thirdCard = MathTool.GetRandomElements(CardManager.Instance.withoutBasicCard(allCardSet), 1);
+        List<string> dyeingCardAList = CardOriginalDataList.Instance.cardOriginalDataList.Keys.ToList();
         List<string> cardList = new List<string>();
-        for (int i = 0; i < cardSlot.Count; i++)
+        /*for (int i=0;i<cardCount-1;i++)
         {
-            if(i!= cardSlot .Count -1)
+            cardList.Add(cardAllList[UnityEngine.Random.Range(0, cardAllList.Count)]);
-            {
+        }*/
-                cardList.Add(cardAllList[UnityEngine.Random.Range(0, cardAllList.Count)]);
+        //¼ÓÈëÒ»ÕÅЧ¹û¿¨
-            }
+        //List<string> effectCardAllList = CardOriginalDataList.Instance.effectCardOriginalDataList.Keys.ToList();
-            else
+        //cardList.Add(effectCardAllList[UnityEngine.Random.Range(0, effectCardAllList.Count)]);
-            {
+        cardList.Add(dyeingCardSet.ElementAt(0));
-                cardList.Add(CardOriginalDataList.Instance.effectCardOriginalDataList .Keys .ToList ()[Random.Range(0, CardOriginalDataList.Instance.effectCardOriginalDataList.Count)]);
+        cardList.Add(effectCardSet.ElementAt(0));
-            }
+        cardList.Add(thirdCard.ElementAt(0));
-            
-        }
         for (int i = 0; i < cardSlot.Count; i++)
         {
             var currentCard = PlayerStatsManager .Instance .CreateCardWithIDForLook(cardList[i], cardSlot[i]);

ColorlessWorld-2024-4-2/Assets/Scripts/manager/ScenceLoadManager.cs

@@ -28,7 +28,7 @@ public class ScenceLoadManager : Singleton <ScenceLoadManager>
         AsyncOperation operation = SceneManager.LoadSceneAsync(levelIndex);
 
         operation.allowSceneActivation = false;
-
+        Debug.Log("operation是" + operation.isDone);
         while (!operation .isDone )
         {
             slider.value = operation.progress;