Browse Source

地块形状改变1017

pull/213/head
45 2 months ago
parent
commit
0fa600601c
  1. 69
      ColorlessWorld-2024-4-2/Assets/Anim/StartChooseGetCard/GetWeaponNode/CantGetWeaponNode.anim
  2. 69
      ColorlessWorld-2024-4-2/Assets/Anim/StartChooseGetCard/GetWeaponNode/EnterWeaponNode.anim
  3. 69
      ColorlessWorld-2024-4-2/Assets/Anim/StartChooseGetCard/GetWeaponNode/GetWeaponNode.anim
  4. 19
      ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset
  5. 2
      ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Blue.mat
  6. 2
      ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Green.mat
  7. 2
      ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Matal.mat
  8. 2
      ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Red.mat
  9. 2
      ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_White.mat
  10. 2
      ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Yellow.mat
  11. 4
      ColorlessWorld-2024-4-2/Assets/Particle Eff/UI Animation/UI_AttackPreview/BarDuiZhuang/Bar_DuiZhuang_left.anim
  12. 4
      ColorlessWorld-2024-4-2/Assets/Particle Eff/UI Animation/UI_AttackPreview/BarDuiZhuang/Bar_DuiZhuang_right.anim
  13. 13
      ColorlessWorld-2024-4-2/Assets/Scenes/ChooseWeaponNew.unity
  14. 7
      ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity
  15. 9
      ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs
  16. 33
      ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs

69
ColorlessWorld-2024-4-2/Assets/Anim/StartChooseGetCard/GetWeaponNode/CantGetWeaponNode.anim

@ -362,6 +362,36 @@ AnimationClip:
classID: 1
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_BlocksRaycasts
path:
classID: 225
script: {fileID: 0}
flags: 0
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@ -478,6 +508,15 @@ AnimationClip:
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
attribute: 3739863151
script: {fileID: 0}
typeID: 225
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
@ -1094,6 +1133,36 @@ AnimationClip:
classID: 1
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_BlocksRaycasts
path:
classID: 225
script: {fileID: 0}
flags: 0
m_EulerEditorCurves:
- serializedVersion: 2
curve:

69
ColorlessWorld-2024-4-2/Assets/Anim/StartChooseGetCard/GetWeaponNode/EnterWeaponNode.anim

@ -389,6 +389,36 @@ AnimationClip:
classID: 1
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_BlocksRaycasts
path:
classID: 225
script: {fileID: 0}
flags: 0
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@ -505,6 +535,15 @@ AnimationClip:
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
attribute: 3739863151
script: {fileID: 0}
typeID: 225
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
@ -1148,6 +1187,36 @@ AnimationClip:
classID: 1
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_BlocksRaycasts
path:
classID: 225
script: {fileID: 0}
flags: 0
m_EulerEditorCurves:
- serializedVersion: 2
curve:

69
ColorlessWorld-2024-4-2/Assets/Anim/StartChooseGetCard/GetWeaponNode/GetWeaponNode.anim

@ -470,6 +470,36 @@ AnimationClip:
classID: 1
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1.6666666
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_BlocksRaycasts
path:
classID: 225
script: {fileID: 0}
flags: 0
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@ -586,6 +616,15 @@ AnimationClip:
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
attribute: 3739863151
script: {fileID: 0}
typeID: 225
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
@ -1364,6 +1403,36 @@ AnimationClip:
classID: 1
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1.6666666
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_BlocksRaycasts
path:
classID: 225
script: {fileID: 0}
flags: 0
m_EulerEditorCurves:
- serializedVersion: 2
curve:

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

@ -13,12 +13,13 @@ MonoBehaviour:
m_Name: cardDeckList
m_EditorClassIdentifier:
cardDeckList:
- 1018
- 1018
- 1018
- 1018
- 1018
- 1027
- 1027
- 1027
- 1027
- 1025
- 1025
- 1025
- 1025
- 1025
- 1025
- 1025
- 1025
- 1025
- 1025

2
ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Blue.mat

@ -349,7 +349,7 @@ Material:
- _MainTexRefine: {r: 1, g: 1, b: 1, a: 0}
- _MaskPannerAndRotation: {r: 0, g: 0, b: 0, a: 0}
- _MaskRefine: {r: 0, g: 1, b: 1, a: 0}
- _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.5, a: 0}
- _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.36666682, a: 0}
- _Panner_Rotation: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
- _Tex2Tiling: {r: 5, g: 0.33, b: 0, a: 0}

2
ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Green.mat

@ -349,7 +349,7 @@ Material:
- _MainTexRefine: {r: 1, g: 1, b: 1, a: 0}
- _MaskPannerAndRotation: {r: 0, g: 0, b: 0, a: 0}
- _MaskRefine: {r: 0, g: 1, b: 1, a: 0}
- _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.5, a: 0}
- _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.4333334, a: 0}
- _Panner_Rotation: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
- _Tex2Tiling: {r: 5, g: 0.33, b: 0, a: 0}

2
ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Matal.mat

@ -349,7 +349,7 @@ Material:
- _MainTexRefine: {r: 1, g: 1, b: 1, a: 0}
- _MaskPannerAndRotation: {r: 0, g: 0, b: 0, a: 0}
- _MaskRefine: {r: 0, g: 1, b: 1, a: 0}
- _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.5, a: 0}
- _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.30000025, a: 0}
- _Panner_Rotation: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
- _Tex2Tiling: {r: 5, g: 0.33, b: 0, a: 0}

2
ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Red.mat

@ -349,7 +349,7 @@ Material:
- _MainTexRefine: {r: 1, g: 1, b: 1, a: 0}
- _MaskPannerAndRotation: {r: 0, g: 0, b: 0, a: 0}
- _MaskRefine: {r: 0, g: 1, b: 1, a: 0}
- _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.5, a: 0}
- _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.4333334, a: 0}
- _Panner_Rotation: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
- _Tex2Tiling: {r: 5, g: 0.33, b: 0, a: 0}

2
ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_White.mat

@ -30,7 +30,7 @@ Material:
m_Ints: []
m_Floats: []
m_Colors:
- _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.000053972006, a: 0}
- _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0, a: 0}
- _Tex2offset: {r: 0.6, g: 0, b: 0, a: 0}
m_BuildTextureStacks: []
--- !u!114 &558137770919511581

2
ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Yellow.mat

@ -349,7 +349,7 @@ Material:
- _MainTexRefine: {r: 1, g: 1, b: 1, a: 0}
- _MaskPannerAndRotation: {r: 0, g: 0, b: 0, a: 0}
- _MaskRefine: {r: 0, g: 1, b: 1, a: 0}
- _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.5, a: 0}
- _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.30000025, a: 0}
- _Panner_Rotation: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
- _Tex2Tiling: {r: 5, g: 0.33, b: 0, a: 0}

4
ColorlessWorld-2024-4-2/Assets/Particle Eff/UI Animation/UI_AttackPreview/BarDuiZhuang/Bar_DuiZhuang_left.anim

@ -87,14 +87,14 @@ AnimationClip:
intParameter: 0
messageOptions: 0
- time: 1
functionName: PlayerUpScore
functionName: EnemyUpScore
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
- time: 1.5
functionName: EnemyUpScore
functionName: PlayerUpScore
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0

4
ColorlessWorld-2024-4-2/Assets/Particle Eff/UI Animation/UI_AttackPreview/BarDuiZhuang/Bar_DuiZhuang_right.anim

@ -87,14 +87,14 @@ AnimationClip:
intParameter: 0
messageOptions: 0
- time: 1
functionName: EnemyUpScore
functionName: PlayerUpScore
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
- time: 1.5
functionName: PlayerUpScore
functionName: EnemyUpScore
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0

13
ColorlessWorld-2024-4-2/Assets/Scenes/ChooseWeaponNew.unity

@ -14207,6 +14207,7 @@ GameObject:
- component: {fileID: 1010123424}
- component: {fileID: 1010123426}
- component: {fileID: 1010123427}
- component: {fileID: 1010123428}
m_Layer: 5
m_Name: ChooseWeaponNodePanel
m_TagString: Untagged
@ -14310,6 +14311,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7d07b6b7217cbee468422fa1f8485641, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!225 &1010123428
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1010123422}
m_Enabled: 1
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!1 &1013219087
GameObject:
m_ObjectHideFlags: 0

7
ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity

@ -118089,9 +118089,6 @@ MonoBehaviour:
- Y: []
- Y: []
- Y: []
- Y: []
- Y: []
- Y: []
character: 0
lastWhoColor: 0
playerState: {fileID: 0}
@ -186882,12 +186879,12 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mapUnity: {fileID: 887005656701010215, guid: ecde4b12dc4538b4caff9ada56c9ab30, type: 3}
line: 7
line: 6
column: 5
generatePoint: {fileID: 514899946}
lineOffSet: {x: 1.43, y: 0, z: 0}
columnOffSet: {x: 0, y: 0, z: 0.86}
mapUniteLineOffset: 00000000fffffffffffffffffeffffffffffffffffffffff00000000
mapUniteLineOffset: 000000000000000000000000000000000000000000000000
enemyGenerateDataList: []
mapUnityFather: {fileID: 471426433}
cardDeckNumberText: {fileID: 1577863296}

9
ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs

@ -152,8 +152,8 @@ public class GameManager : Singleton<GameManager>
playerState = PlayerStatsManager.Instance.playerState;
//生成空地图列表
// GenerateEnmptyMapList();
GenerateEnmptyMapListDefault();
GenerateEnmptyMapList();
// GenerateEnmptyMapListDefault();
//开局场地涂色并开始阶段
StartCoroutine(StartStartColourCoroutine(complete));
@ -214,6 +214,9 @@ public class GameManager : Singleton<GameManager>
for (int i = 0; i < MapManager.Instance.line; i++)
{
int currentColum = 0;
currentColum = MapManager.Instance.column;
//暂时不减
/*
if (i % 2 == 0)
{
currentColum = MapManager.Instance.column;
@ -221,7 +224,7 @@ public class GameManager : Singleton<GameManager>
else
{
currentColum = MapManager.Instance.column - 1;
}
}*/
for (int j = 0; j < currentColum; j++)
{
X[i].Y.Add(null);

33
ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs

@ -177,7 +177,8 @@ public class MapManager : Singleton<MapManager>
IEnumerator GenerateProcess()
{
yield return StartCoroutine(MapGenerateDefault());
// yield return StartCoroutine(MapGenerateDefault());
yield return StartCoroutine(MapGenerateCube());
yield return StartCoroutine(SetUpMapUnity());
yield return StartCoroutine(TransformMapUnity());
yield return StartCoroutine(SetUpMapUnityForCube());
@ -511,7 +512,7 @@ public class MapManager : Singleton<MapManager>
}
yield return null;
}
//两边尖尖的地块
IEnumerator MapGenerateDefault()
{
int middleLine = (line - 1) / 2;
@ -554,7 +555,35 @@ public class MapManager : Singleton<MapManager>
yield return null;
}
//正方形地块
IEnumerator MapGenerateCube()
{
for (int i = 0; i < line; i++)
{
if (i != 0)
{
generatePoint.transform.position += columnOffSet;
}
generatePoint.transform.position = new Vector3(0, 0, generatePoint.transform.position.z);
if (i % 2 != 0)
{
generatePoint.transform.position += (lineOffSet / 2.0f);
}
for (int j = 0; j < column; j++)
{
var a = Instantiate(mapUnity, generatePoint.transform.position, mapUnity.transform.rotation);
a.transform.SetParent(mapUnityFather);
MapUnity currentMapUnityScript = a.GetComponent<MapUnity>();
currentMapUnityScript.locationX = i;
currentMapUnityScript.locationY = j;
currentMapUnityScript.RegisterUnit();
generatePoint.transform.position += lineOffSet;
}
}
yield return null;
}
//地块上移动画
IEnumerator UPMoveMapUnity()
{

Loading…
Cancel
Save