Browse Source

0927尝试

pull/202/head
yjm484 3 months ago
parent
commit
e2092cb57c
  1. 18
      ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset
  2. 2
      ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Believer.prefab
  3. 6
      ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs
  4. 2
      ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_5.csv
  5. 3
      ColorlessWorld-2024-4-2/Packages/manifest.json
  6. 7
      ColorlessWorld-2024-4-2/Packages/packages-lock.json
  7. BIN
      ColorlessWorld-2024-4-2/obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache

18
ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset

@ -13,12 +13,12 @@ MonoBehaviour:
m_Name: cardDeckList m_Name: cardDeckList
m_EditorClassIdentifier: m_EditorClassIdentifier:
cardDeckList: cardDeckList:
- 1026 - 1018
- 1036 - 1018
- 1029 - 1018
- 1021 - 1018
- 1033 - 1018
- 1034 - 1027
- 1029 - 1027
- 1034 - 1027
- 1022 - 1027

2
ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Believer.prefab

@ -485,7 +485,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_text: m_text: "\u4E3A\u5468\u56F4\u989C\u8272\u6700\u591A\u7684\u5730\u5757\u63D0\u4F9B+6\u8BA1\u6570"
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: d12673ed3c85b3743b660f41c0db6c7b, type: 2} m_fontAsset: {fileID: 11400000, guid: d12673ed3c85b3743b660f41c0db6c7b, type: 2}
m_sharedMaterial: {fileID: -4989954011452443200, guid: d12673ed3c85b3743b660f41c0db6c7b, m_sharedMaterial: {fileID: -4989954011452443200, guid: d12673ed3c85b3743b660f41c0db6c7b,

6
ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs

@ -2,12 +2,13 @@ using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading;
using Unity.VisualScripting; using Unity.VisualScripting;
using UnityEngine; using UnityEngine;
using UnityEngine.InputSystem; using UnityEngine.InputSystem;
using UnityEngine.Playables; using UnityEngine.Playables;
using UnityEngine.UI; using UnityEngine.UI;
using Cysharp.Threading.Tasks;
public class MapUnity : MonoBehaviour public class MapUnity : MonoBehaviour
{ {
public List<MapUnity> unitPool;//ÁÙ½Ó¶ÔÏó³Ø public List<MapUnity> unitPool;//ÁÙ½Ó¶ÔÏó³Ø
@ -534,6 +535,9 @@ public class MapUnity : MonoBehaviour
HashSet<MapUnity> nodeRange = new HashSet<MapUnity>(); HashSet<MapUnity> nodeRange = new HashSet<MapUnity>();
nodeRange.Add(this); nodeRange.Add(this);
getNodeTools.getCircleNodeExceptSelf(nodeRange, 1); getNodeTools.getCircleNodeExceptSelf(nodeRange, 1);
Debug.Log("getCircleNodeExceptSelf大小是" + nodeRange.Count);
//await UniTask.Delay(100, ignoreTimeScale: true);
//await UniTask.SwitchToMainThread();
foreach (MapUnity node in nodeRange) foreach (MapUnity node in nodeRange)
{ {
node.switchColor(Name.intColorTostring(newColor)); node.switchColor(Name.intColorTostring(newColor));

2
ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_5.csv

@ -14,7 +14,7 @@
1016,1,1,1,3_1,none,53,2&3,0_0;1_0;2_0;0_1;0_-1;1_2;1_-2,red;red;red;red;red;red;red,CardIcon/1021,散射,1 1016,1,1,1,3_1,none,53,2&3,0_0;1_0;2_0;0_1;0_-1;1_2;1_-2,red;red;red;red;red;red;red,CardIcon/1021,散射,1
1017,1,1,1,3_1,none,17,1,0_0;1_0;2_0;3_0;2_1;2_-1;2_2;2_-2,blue;blue;blue;blue;blue;blue;blue;blue,CardIcon/1021,单向箭头,2 1017,1,1,1,3_1,none,17,1,0_0;1_0;2_0;3_0;2_1;2_-1;2_2;2_-2,blue;blue;blue;blue;blue;blue;blue;blue,CardIcon/1021,单向箭头,2
1007,1,2,1,3_1,none,1,20,0_0;1_0;0_1;0_-1;1_1;1_-1;1_2;1_-2,black;black;black;black;black;black;black;black,CardIcon/1021,黑火药,3 1007,1,2,1,3_1,none,1,20,0_0;1_0;0_1;0_-1;1_1;1_-1;1_2;1_-2,black;black;black;black;black;black;black;black,CardIcon/1021,黑火药,3
1018,1,0,1,,none,none,none,0_0;1_0;-1_0,red;red_Hippo;red,CardIcon/1021,Test18,1 1018,1,0,1,,none,none,none,0_0;1_0;-1_0,red;red_Bomb;blue,CardIcon/1021,Test18,1
1019,1,0,1,,none,none,none,0_0;1_0;-1_0,blue;blue;blue,CardIcon/1021,Test19,1 1019,1,0,1,,none,none,none,0_0;1_0;-1_0,blue;blue;blue,CardIcon/1021,Test19,1
1020,1,0,1,,none,none,none,0_0;1_0;-1_0,yellow;yellow;yellow,CardIcon/1021,Test20,1 1020,1,0,1,,none,none,none,0_0;1_0;-1_0,yellow;yellow;yellow,CardIcon/1021,Test20,1
1021,1,0,1,,none,none,none,0_0;0_1;0_-1;1_0,red;blue;yellow;red,CardIcon/1021,Test21,1 1021,1,0,1,,none,none,none,0_0;0_1;0_-1;1_0,red;blue;yellow;red,CardIcon/1021,Test21,1

1 ID 费用类型 费用 施法范围 作用范围 条件 功能 数值 地块标记 地块颜色 图片路径 名称 稀有度
14 1016 1 1 1 3_1 none 53 2&3 0_0;1_0;2_0;0_1;0_-1;1_2;1_-2 red;red;red;red;red;red;red CardIcon/1021 散射 1
15 1017 1 1 1 3_1 none 17 1 0_0;1_0;2_0;3_0;2_1;2_-1;2_2;2_-2 blue;blue;blue;blue;blue;blue;blue;blue CardIcon/1021 单向箭头 2
16 1007 1 2 1 3_1 none 1 20 0_0;1_0;0_1;0_-1;1_1;1_-1;1_2;1_-2 black;black;black;black;black;black;black;black CardIcon/1021 黑火药 3
17 1018 1 0 1 none none none 0_0;1_0;-1_0 red;red_Hippo;red red;red_Bomb;blue CardIcon/1021 Test18 1
18 1019 1 0 1 none none none 0_0;1_0;-1_0 blue;blue;blue CardIcon/1021 Test19 1
19 1020 1 0 1 none none none 0_0;1_0;-1_0 yellow;yellow;yellow CardIcon/1021 Test20 1
20 1021 1 0 1 none none none 0_0;0_1;0_-1;1_0 red;blue;yellow;red CardIcon/1021 Test21 1

3
ColorlessWorld-2024-4-2/Packages/manifest.json

@ -47,6 +47,7 @@
"com.unity.modules.video": "1.0.0", "com.unity.modules.video": "1.0.0",
"com.unity.modules.vr": "1.0.0", "com.unity.modules.vr": "1.0.0",
"com.unity.modules.wind": "1.0.0", "com.unity.modules.wind": "1.0.0",
"com.unity.modules.xr": "1.0.0" "com.unity.modules.xr": "1.0.0",
"com.cysharp.unitask": "https://github.com/Cysharp/UniTask.git?path=src/UniTask/Assets/Plugins/UniTask"
} }
} }

7
ColorlessWorld-2024-4-2/Packages/packages-lock.json

@ -1,5 +1,12 @@
{ {
"dependencies": { "dependencies": {
"com.cysharp.unitask": {
"version": "https://github.com/Cysharp/UniTask.git?path=src/UniTask/Assets/Plugins/UniTask",
"depth": 0,
"source": "git",
"dependencies": {},
"hash": "ec9204d381eb406a8f6e68fd67429a96ca6c5322"
},
"com.unity.2d.animation": { "com.unity.2d.animation": {
"version": "9.0.4", "version": "9.0.4",
"depth": 0, "depth": 0,

BIN
ColorlessWorld-2024-4-2/obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache

Binary file not shown.
Loading…
Cancel
Save