Browse Source

涂色预览更改0720

pull/149/head
45 5 months ago
parent
commit
10e07ca8dc
  1. 5
      ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v04-Color.prefab
  2. 13
      ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/PictureMapUnity.prefab
  3. 156
      ColorlessWorld-2024-4-2/Assets/Prefab/Relic/Relic.prefab
  4. 146
      ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity
  5. 121
      ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity
  6. 15
      ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs
  7. 9
      ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs
  8. 299
      ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs
  9. 2
      ColorlessWorld-2024-4-2/Assets/Scripts/Relic/LegacyNode.cs
  10. 46
      ColorlessWorld-2024-4-2/Assets/Scripts/Tool/getNodeTools.cs

5
ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v04-Color.prefab

@ -1442,7 +1442,6 @@ MonoBehaviour:
type: 3} type: 3}
cardDataSummary: {fileID: 688789690455570313} cardDataSummary: {fileID: 688789690455570313}
animator: {fileID: 5188661188061946492} animator: {fileID: 5188661188061946492}
borderAnim: {fileID: 3987161932426332114}
normalBorder: {fileID: 7628014957071452733} normalBorder: {fileID: 7628014957071452733}
triggerBorde: {fileID: 223239223487469043} triggerBorde: {fileID: 223239223487469043}
currentCost: 0 currentCost: 0
@ -1535,7 +1534,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4169693119190854323} m_GameObject: {fileID: 4169693119190854323}
m_Enabled: 1 m_Enabled: 0
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 894fd8c62723dcc42aecbd678cebb6a7, type: 3} m_Script: {fileID: 11500000, guid: 894fd8c62723dcc42aecbd678cebb6a7, type: 3}
m_Name: m_Name:
@ -2584,7 +2583,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!4 &4917561388307086295 --- !u!4 &4917561388307086295
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

13
ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/PictureMapUnity.prefab

@ -342,12 +342,12 @@ MonoBehaviour:
blackColour: blackColour:
- {fileID: 2800000, guid: 0d190d4d18121de46b55424cb52155f4, type: 3} - {fileID: 2800000, guid: 0d190d4d18121de46b55424cb52155f4, type: 3}
whiteColour: whiteColour:
- {fileID: 2800000, guid: 9f64915678c4dcb43b1266e49700146c, type: 3} - {fileID: 2800000, guid: 174158a9ca1149747bbd00cf376bb9b6, type: 3}
- {fileID: 2800000, guid: fe69528fd92aa7f4b8c2529bef7a3ac4, type: 3} - {fileID: 2800000, guid: acb404899dfdae946a7a481a7b7a64ac, type: 3}
- {fileID: 2800000, guid: 8229454afa686f34da83af9f5f955628, type: 3} - {fileID: 2800000, guid: cfc596b438638b5428fa359bdcf0498c, type: 3}
- {fileID: 2800000, guid: 58c17d73353b4fc4785669248cd48d99, type: 3} - {fileID: 2800000, guid: 2579ee4163173fd4da71cfb0e0d53990, type: 3}
- {fileID: 2800000, guid: e689cad2509d7bc4bba7defbba41a822, type: 3} - {fileID: 2800000, guid: cf40d5d917d1d544b8599d165fe451b0, type: 3}
- {fileID: 2800000, guid: 042cf53df8df4314ca996a86ade12388, type: 3} - {fileID: 2800000, guid: 395bf285fd0db4d4aa71e74c2dbc0926, type: 3}
metalColour: metalColour:
- {fileID: 2800000, guid: efe04a796da1abd42a9622451d56a1f1, type: 3} - {fileID: 2800000, guid: efe04a796da1abd42a9622451d56a1f1, type: 3}
colourGameObject: {fileID: 7818877686521749494} colourGameObject: {fileID: 7818877686521749494}
@ -396,6 +396,7 @@ MonoBehaviour:
touchRayStartPoint: {fileID: 8168328524498649588} touchRayStartPoint: {fileID: 8168328524498649588}
colorUnderAttack: 0 colorUnderAttack: 0
environment: 0 environment: 0
environmentObject: {fileID: 0}
blockNode: {fileID: 0} blockNode: {fileID: 0}
--- !u!114 &7941956919028205299 --- !u!114 &7941956919028205299
MonoBehaviour: MonoBehaviour:

156
ColorlessWorld-2024-4-2/Assets/Prefab/Relic/Relic.prefab

@ -30,7 +30,9 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children:
- {fileID: 2036141153358036783}
- {fileID: 6978352937395653001}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
@ -59,7 +61,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
@ -92,3 +94,153 @@ MonoBehaviour:
offSet: {x: 1.5, y: 0, z: 0.1} offSet: {x: 1.5, y: 0, z: 0.1}
layoutGroup: {fileID: 0} layoutGroup: {fileID: 0}
textAnchor: 1 textAnchor: 1
--- !u!1 &2701932841104875323
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2036141153358036783}
- component: {fileID: 1322550422841461933}
- component: {fileID: 2688012022181979120}
m_Layer: 5
m_Name: Ground
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2036141153358036783
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2701932841104875323}
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: 1311931387777519489}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1322550422841461933
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2701932841104875323}
m_CullTransparentMesh: 1
--- !u!114 &2688012022181979120
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2701932841104875323}
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: 7aed610e3ffe5b24db660525833d909a, 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 &2866822106982800922
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6978352937395653001}
- component: {fileID: 7931229313727853148}
- component: {fileID: 3758737539243108653}
m_Layer: 5
m_Name: Icon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6978352937395653001
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2866822106982800922}
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: 1311931387777519489}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7931229313727853148
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2866822106982800922}
m_CullTransparentMesh: 1
--- !u!114 &3758737539243108653
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2866822106982800922}
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: 0d0df29c5c33ba74b85599f3af6fa954, 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

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

@ -5027,7 +5027,6 @@ MonoBehaviour:
isMapChange: 0 isMapChange: 0
playerWeaponNodeList: {fileID: 2109090871} playerWeaponNodeList: {fileID: 2109090871}
enemyWeaponNodeList: {fileID: 1930541759} enemyWeaponNodeList: {fileID: 1930541759}
isMapChange: 1
--- !u!1 &142863955 --- !u!1 &142863955
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -8356,6 +8355,124 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 228607990} m_GameObject: {fileID: 228607990}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &229235248
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 229235249}
- component: {fileID: 229235251}
- component: {fileID: 229235250}
m_Layer: 0
m_Name: Picture Spot Light
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &229235249
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 229235248}
serializedVersion: 2
m_LocalRotation: {x: 0.7572778, y: -0, z: -0, w: 0.6530929}
m_LocalPosition: {x: 53, y: 55.93, z: 4.66}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1884246785}
m_LocalEulerAnglesHint: {x: 98.45001, y: 0, z: 0}
--- !u!114 &229235250
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 229235248}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Version: 3
m_UsePipelineSettings: 1
m_AdditionalLightsShadowResolutionTier: 2
m_LightLayerMask: 1
m_RenderingLayers: 1
m_CustomShadowLayers: 0
m_ShadowLayerMask: 1
m_ShadowRenderingLayers: 1
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
m_SoftShadowQuality: 0
--- !u!108 &229235251
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 229235248}
m_Enabled: 1
serializedVersion: 10
m_Type: 0
m_Shape: 0
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 70
m_Range: 50
m_SpotAngle: 113.643364
m_InnerSpotAngle: 66.70945
m_CookieSize: 10
m_Shadows:
m_Type: 0
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2
m_CullingMatrixOverride:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_UseCullingMatrixOverride: 0
m_Cookie: {fileID: 2800000, guid: e0736cc0a2d594c47ab77ccc0e1866e7, type: 3}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 12279
m_RenderingLayerMask: 1
m_Lightmapping: 4
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!1 &230475881 --- !u!1 &230475881
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -41744,10 +41861,21 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
score: 0 score: 0
scoreMul: 0
condition: condition:
result: result:
conditionValue:
resultValue:
nodesMark: [] nodesMark: []
nodesColor: [] nodesColor: []
extraRedNodeCount: 0
extraBlueNodeCount: 0
extraYellowNodeCount: 0
extraMostNodeCount: 0
extraLeastNodeCount: 0
extraAllNodeCount: 0
isIgnoreCondition: 0
isDoubleSettle: 0
--- !u!1 &1009332616 --- !u!1 &1009332616
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -66477,7 +66605,8 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: -0.0000051234} m_LocalPosition: {x: 0, y: 0, z: -0.0000051234}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children:
- {fileID: 1008343832}
m_Father: {fileID: 1930541759} m_Father: {fileID: 1930541759}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
@ -68296,7 +68425,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0.000045776367, y: 0} m_AnchoredPosition: {x: 0.000061035156, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1599887536 --- !u!114 &1599887536
@ -68486,7 +68615,7 @@ Canvas:
serializedVersion: 3 serializedVersion: 3
m_RenderMode: 1 m_RenderMode: 1
m_Camera: {fileID: 330585545} m_Camera: {fileID: 330585545}
m_PlaneDistance: 4.1 m_PlaneDistance: 4
m_PixelPerfect: 0 m_PixelPerfect: 0
m_ReceivesEvents: 1 m_ReceivesEvents: 1
m_OverrideSorting: 0 m_OverrideSorting: 0
@ -80139,7 +80268,8 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children:
- {fileID: 229235249}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1885060087 --- !u!1 &1885060087
@ -85807,7 +85937,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2038017530} m_GameObject: {fileID: 2038017530}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -85816,8 +85946,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 20.869873, y: 7.2} m_AnchoredPosition: {x: 146.40002, y: 387.6}
m_SizeDelta: {x: 109.1, y: 682.3} m_SizeDelta: {x: 702.4, y: 98.3}
m_Pivot: {x: 0, y: 0.5} m_Pivot: {x: 0, y: 0.5}
--- !u!1 &2039375792 --- !u!1 &2039375792
GameObject: GameObject:

121
ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity

@ -12018,7 +12018,8 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children:
- {fileID: 1450433004}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &658975464 --- !u!1 &658975464
@ -27762,6 +27763,124 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1447026498} m_GameObject: {fileID: 1447026498}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &1450433003
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1450433004}
- component: {fileID: 1450433006}
- component: {fileID: 1450433005}
m_Layer: 0
m_Name: Picture Spot Light
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1450433004
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1450433003}
serializedVersion: 2
m_LocalRotation: {x: 0.7572778, y: -0, z: -0, w: 0.6530929}
m_LocalPosition: {x: 53, y: 55.93, z: 4.66}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 657490528}
m_LocalEulerAnglesHint: {x: 98.45001, y: 0, z: 0}
--- !u!114 &1450433005
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1450433003}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Version: 3
m_UsePipelineSettings: 1
m_AdditionalLightsShadowResolutionTier: 2
m_LightLayerMask: 1
m_RenderingLayers: 1
m_CustomShadowLayers: 0
m_ShadowLayerMask: 1
m_ShadowRenderingLayers: 1
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
m_SoftShadowQuality: 0
--- !u!108 &1450433006
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1450433003}
m_Enabled: 1
serializedVersion: 10
m_Type: 0
m_Shape: 0
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 70
m_Range: 50
m_SpotAngle: 113.643364
m_InnerSpotAngle: 66.70945
m_CookieSize: 10
m_Shadows:
m_Type: 0
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2
m_CullingMatrixOverride:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_UseCullingMatrixOverride: 0
m_Cookie: {fileID: 2800000, guid: e0736cc0a2d594c47ab77ccc0e1866e7, type: 3}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 12279
m_RenderingLayerMask: 1
m_Lightmapping: 4
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!1 &1453542791 --- !u!1 &1453542791
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

15
ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs

@ -545,15 +545,16 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
//显示范围 //显示范围
dyeing(); dyeing();
//setEffectRangePreview(cardEntity.cardOriginalData.EffectRange, euler, currentNode); //setEffectRangePreview(cardEntity.cardOriginalData.EffectRange, euler, currentNode);
//influencePreviewPool.Add(currentNode); //influencePreviewPool.Add(currentNode);
//更新涂色预览材质 //更新涂色预览材质
// SettlementManager.Instance.PreviewSwitchColor(cardEntity.cardOriginalData, currentNode); // SettlementManager.Instance.PreviewSwitchColor(cardEntity.cardOriginalData, currentNode);
//更新地块计数(包含改色预览) //更新地块计数(包含改色预览)
//SettlementManager.Instance.PreviewColorMapUnity(cardEntity.cardOriginalData, currentNode); //SettlementManager.Instance.PreviewColorMapUnity(cardEntity.cardOriginalData, currentNode);
//} //}
// 更新地块计数(包含改色预览)
SettlementManager.Instance.PreviewColorMapUnity(cardEntity.cardOriginalData, currentNode);
//更新效果作用范围内怪物虚血 //更新效果作用范围内怪物虚血
//EnemyManager.Instance.ShowExpHp_Observer(cardEntity.influencePreviewPool); //EnemyManager.Instance.ShowExpHp_Observer(cardEntity.influencePreviewPool);

9
ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs

@ -98,7 +98,6 @@ public class CardEntity : MonoBehaviour
[Header("卡牌销毁动画器")] [Header("卡牌销毁动画器")]
public Animator animator; public Animator animator;
[Header("卡牌边框画器控件")] [Header("卡牌边框画器控件")]
public Animator borderAnim;
public GameObject normalBorder; public GameObject normalBorder;
public GameObject triggerBorde; public GameObject triggerBorde;
[Header("卡牌费用变化监测")] [Header("卡牌费用变化监测")]
@ -125,16 +124,16 @@ public class CardEntity : MonoBehaviour
{ {
currentCost = cardOriginalData.Cost; currentCost = cardOriginalData.Cost;
//注册到费用变化接口--移除在变小卡那里 //注册到费用变化接口--移除在变小卡那里
if ( isLookCard ==false && GameManager.Instance != null) /* if ( isLookCard ==false && GameManager.Instance != null)
{ {
GameManager.Instance.costChange += CheckUse; GameManager.Instance.costChange += CheckUse;
} }*/
StartCoroutine(SyncVuleText()); StartCoroutine(SyncVuleText());
//初始化卡牌边框颜色 //初始化卡牌边框颜色
normalBorder.SetActive(true); // normalBorder.SetActive(true);
triggerBorde.SetActive(false); // triggerBorde.SetActive(false);
tempMinusCost = 0; tempMinusCost = 0;
} }

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

@ -252,52 +252,109 @@ public class GameManager : Singleton<GameManager>
break; break;
} }
} }
public void SyncColourSunUI() public void SyncColourSunUI()
{ {
float redNodeCount = MapUnityManager.Instance.redNodeCount; (int origin, int extra, int all) redNodeCount = getNodeTools.getNodesOriginCount(Name.NodeColor.Red);
float blueNodeCount = MapUnityManager.Instance.blueNodeCount; (int origin, int extra, int all) blueNodeCount = getNodeTools.getNodesOriginCount(Name.NodeColor.Blue);
float greenNodeCount = MapUnityManager.Instance.greenNodeCount; (int origin, int extra, int all) greenNodeCount = getNodeTools.getNodesOriginCount(Name.NodeColor.Green);
float yellowNodeCount = MapUnityManager.Instance.yellowNodeCount; (int origin, int extra, int all) yellowNodeCount = getNodeTools.getNodesOriginCount(Name.NodeColor.Yellow);
float whiteNodeCount = MapUnityManager.Instance.whiteNodeCount; (int origin, int extra, int all) whiteNodeCount = getNodeTools.getNodesOriginCount(Name.NodeColor.White);
float blackNodeCount = MapUnityManager.Instance.blackNodeCount; (int origin, int extra, int all) blackNodeCount = getNodeTools.getNodesOriginCount(Name.NodeColor.Black);
float metalNodeCount = MapUnityManager.Instance.metalNodeCount; (int origin, int extra, int all) metalNodeCount = getNodeTools.getNodesOriginCount(Name.NodeColor.Metal);
redNodeCountLatest = Mathf.Lerp(redNodeCountLatest, redNodeCount, Time.deltaTime * sunSpeed); redNodeCountLatest = Mathf.Lerp(redNodeCountLatest, redNodeCount.all, Time.deltaTime * sunSpeed);
blueNodeCountLatest = Mathf.Lerp(blueNodeCountLatest, blueNodeCount, Time.deltaTime * sunSpeed); blueNodeCountLatest = Mathf.Lerp(blueNodeCountLatest, blueNodeCount.all, Time.deltaTime * sunSpeed);
greenNodeCountLatest = Mathf.Lerp(greenNodeCountLatest, greenNodeCount, Time.deltaTime * sunSpeed); greenNodeCountLatest = Mathf.Lerp(greenNodeCountLatest, greenNodeCount.all, Time.deltaTime * sunSpeed);
yellowNodeCountLatest = Mathf.Lerp(yellowNodeCountLatest, yellowNodeCount, Time.deltaTime * sunSpeed); yellowNodeCountLatest = Mathf.Lerp(yellowNodeCountLatest, yellowNodeCount.all, Time.deltaTime * sunSpeed);
// whiteNodeCountLatest = Mathf.Lerp(whiteNodeCountLatest, whiteNodeCount, Time.deltaTime * sunSpeed); // whiteNodeCountLatest = Mathf.Lerp(whiteNodeCountLatest, whiteNodeCount, Time.deltaTime * sunSpeed);
// metalNodeCountLatest = Mathf.Lerp(metalNodeCountLatest, metalNodeCount, Time.deltaTime * sunSpeed); // metalNodeCountLatest = Mathf.Lerp(metalNodeCountLatest, metalNodeCount, Time.deltaTime * sunSpeed);
//ÎÄ×Ö
redText.text = redNodeCount.ToString(); //计算总和
redTextObj.gameObject.SetActive(redNodeCount != 0); float totoalNode = redNodeCount.all + blueNodeCount.all + greenNodeCount.all + yellowNodeCount.all + metalNodeCount.all;
if (totoalNode == 0)
{
totoalNode = 1;
}
greenText.text = greenNodeCount.ToString(); //文字
greenTextObj.gameObject.SetActive(greenNodeCount != 0); redText.text = (redNodeCount.origin).ToString();
redTextObj.gameObject.SetActive(redNodeCount.origin != 0);
if (redNodeCount .extra !=0)//有额外计数,显示额外计数的总和
{
redTextPre.gameObject.SetActive(true);
redTextPre.text = redNodeCount.all.ToString();
}
else
{
redTextPre.gameObject.SetActive(false);
}
yellowText .text = yellowNodeCount.ToString(); greenText.text = (greenNodeCount.origin).ToString();
yellowTextObj.gameObject.SetActive(yellowNodeCount != 0); greenTextObj.gameObject.SetActive(greenNodeCount.all != 0);
if (greenNodeCount.extra != 0)//有额外计数,显示额外计数的总和
{
greenTextPre.gameObject.SetActive(true);
greenTextPre.text = greenNodeCount.all.ToString();
}
else
{
greenTextPre.gameObject.SetActive(false);
}
blueText.text = blueNodeCount.ToString(); yellowText .text = (yellowNodeCount.origin).ToString();
blueTextObj.gameObject.SetActive(blueNodeCount != 0); yellowTextObj.gameObject.SetActive(yellowNodeCount.all != 0);
if (yellowNodeCount.extra != 0)//有额外计数,显示额外计数的总和
{
yellowTextPre.gameObject.SetActive(true);
yellowTextPre.text = yellowNodeCount.all.ToString();
}
else
{
yellowTextPre.gameObject.SetActive(false);
}
blackText.text = blackNodeCount.ToString(); blueText.text = (blueNodeCount.origin).ToString();
// blackTextObj.gameObject.SetActive(blackNodeCount != 0); blueTextObj.gameObject.SetActive(blueNodeCount.all != 0);
if (blueNodeCount.extra != 0)//有额外计数,显示额外计数的总和
{
blueTextPre.gameObject.SetActive(true);
blueTextPre.text = blueNodeCount.all.ToString();
}
else
{
blueTextPre.gameObject.SetActive(false);
}
// whiteText.text = whiteNodeCount.ToString(); blackText.text = (blackNodeCount.origin).ToString();
// whiteTextObj.gameObject.SetActive(whiteNodeCount != 0); if (blackNodeCount.extra != 0)//有额外计数,显示额外计数的总和
{
blackTextPre.gameObject.SetActive(true);
blackTextPre.text = blackNodeCount.all.ToString();
}
else
{
blackTextPre.gameObject.SetActive(false);
}
// blackTextObj.gameObject.SetActive(blackNodeCount != 0);
metalText.text = metalNodeCount.ToString(); // whiteText.text = whiteNodeCount.ToString();
metalTextObj.gameObject.SetActive(metalNodeCount != 0); // whiteTextObj.gameObject.SetActive(whiteNodeCount != 0);
metalText.text = (metalNodeCount.origin).ToString();
metalTextObj.gameObject.SetActive(metalNodeCount.all != 0);
if (metalNodeCount.extra != 0)//有额外计数,显示额外计数的总和
{
metalTextPre.gameObject.SetActive(true);
metalTextPre.text = metalNodeCount.all.ToString();
}
else
{
metalTextPre.gameObject.SetActive(false);
}
// sumPlayerText.text = (redNodeCount + blueNodeCount + greenNodeCount).ToString(); // sumPlayerText.text = (redNodeCount + blueNodeCount + greenNodeCount).ToString();
// sumMiddleText.text = (whiteNodeCount+metalNodeCount ).ToString(); // sumMiddleText.text = (whiteNodeCount+metalNodeCount ).ToString();
// sumRightText.text = blackNodeCount.ToString(); // sumRightText.text = blackNodeCount.ToString();
float totoalNode = redNodeCount + blueNodeCount + greenNodeCount + yellowNodeCount + metalNodeCount;
if(totoalNode ==0)
{
totoalNode = 1;
}
//ÎÄ×ÖλÖà //ÎÄ×ÖλÖÃ
float length = barBox.sizeDelta.x; float length = barBox.sizeDelta.x;
redTextObj.localPosition = new Vector3((length * (Red.fillAmount - 1)) * 0.5f,30, 0); redTextObj.localPosition = new Vector3((length * (Red.fillAmount - 1)) * 0.5f,30, 0);
@ -316,16 +373,16 @@ public class GameManager : Singleton<GameManager>
Green.fillAmount = Red.fillAmount + greenNodeCountLatest / totoalNode; Green.fillAmount = Red.fillAmount + greenNodeCountLatest / totoalNode;
Bule.fillAmount = Green.fillAmount + blueNodeCountLatest / totoalNode; Bule.fillAmount = Green.fillAmount + blueNodeCountLatest / totoalNode;
Yellow .fillAmount = Bule .fillAmount + yellowNodeCountLatest / totoalNode; Yellow .fillAmount = Bule .fillAmount + yellowNodeCountLatest / totoalNode;
// Metal.fillAmount= Yellow.fillAmount+ metalNodeCountLatest / totoalNode; // Metal.fillAmount= Yellow.fillAmount+ metalNodeCountLatest / totoalNode;
// White.fillAmount = Metal.fillAmount + whiteNodeCountLatest / totoalNode; // White.fillAmount = Metal.fillAmount + whiteNodeCountLatest / totoalNode;
// Black.fillAmount = Bule.fillAmount + blackNodeCountLatest / totoalNode; // Black.fillAmount = Bule.fillAmount + blackNodeCountLatest / totoalNode;
//Ô¤ÀÀͿɫ
if (onDrag && currentCardEntity != null ) //预览涂色
if (onDrag && currentCardEntity != null)
{ {
if(currentCardEntity.cardOriginalData.CastingRange != 0) if (currentCardEntity.cardOriginalData.CastingRange != 0)
{ {
if( currentMapNode != null ) if (currentMapNode != null)
{ {
} }
@ -339,41 +396,48 @@ public class GameManager : Singleton<GameManager>
//currentMapNode = playerOn; //currentMapNode = playerOn;
} }
List<int> ints = SettlementManager.Instance.GetNodeCountStats(); List<int> ints = SettlementManager.Instance.GetNodeCountStats();
for (int i = 0; i < ints.Count; i++) for (int i = 0; i < ints.Count; i++)
{ {
switch (i) switch (i)
{ {
case 1: case 1:
redNodeCountLatest = redNodeCount + ints[i]; if (ints[i] != 0)
redText.text = (redNodeCount+ ints[i]).ToString(); redTextObj.gameObject.SetActive(true);
redTextPre .gameObject .SetActive(true); redNodeCountLatest = redNodeCount.all + ints[i];
if(ints[i]>0) redText.text = (redNodeCount.origin + ints[i]).ToString();
{ redTextPre.text = (redNodeCount.all + ints[i]).ToString();
redTextPre.text = "(" +"+" +ints[i].ToString() + ")"; /* redTextPre .gameObject .SetActive(true);
} if(ints[i]>0)
else {
{ redTextPre.text = "(" +"+" +ints[i].ToString() + ")";
redTextPre.text = "(" + ints[i].ToString() + ")"; }
} else
// redTextPre.transform.localPosition = new Vector3(redText.transform.localPosition.x, redText.transform.localPosition.y-75f, 0); {
redTextPre.text = "(" + ints[i].ToString() + ")";
} */
// redTextPre.transform.localPosition = new Vector3(redText.transform.localPosition.x, redText.transform.localPosition.y-75f, 0);
break; break;
case 2: case 2:
/* whiteNodeCountLatest = whiteNodeCount + ints[i]; /* whiteNodeCountLatest = whiteNodeCount + ints[i];
whiteText.text = (whiteNodeCount + ints[i]).ToString(); whiteText.text = (whiteNodeCount + ints[i]).ToString();
whiteTextPre .gameObject .SetActive(true); whiteTextPre .gameObject .SetActive(true);
if (ints[i] > 0) if (ints[i] > 0)
{ {
whiteTextPre.text = "(" + "+" + ints[i].ToString() + ")"; whiteTextPre.text = "(" + "+" + ints[i].ToString() + ")";
} }
else else
{ {
whiteTextPre.text = "(" + ints[i].ToString() + ")"; whiteTextPre.text = "(" + ints[i].ToString() + ")";
} */ } */
break; break;
case 3: case 3:
blueNodeCountLatest = blueNodeCount + ints[i]; if (ints[i] != 0)
blueText.text = (blueNodeCount+ ints[i]).ToString(); blueTextObj.gameObject.SetActive(true);
blueTextPre .gameObject .SetActive(true); blueNodeCountLatest = blueNodeCount.all + ints[i];
blueText.text = (blueNodeCount.origin + ints[i]).ToString();
blueTextPre.text = (blueNodeCount.all + ints[i]).ToString();
/*blueTextPre .gameObject .SetActive(true);
if (ints[i] > 0) if (ints[i] > 0)
{ {
blueTextPre.text = "(" +"+"+ ints[i].ToString() + ")"; blueTextPre.text = "(" +"+"+ ints[i].ToString() + ")";
@ -382,13 +446,16 @@ public class GameManager : Singleton<GameManager>
{ {
blueTextPre.text = "(" + ints[i].ToString() + ")"; blueTextPre.text = "(" + ints[i].ToString() + ")";
} }
blueTextPre.text = "(" + ints[i].ToString() + ")"; blueTextPre.text = "(" + ints[i].ToString() + ")";*/
// blueTextPre.transform.localPosition = new Vector3(blueText.transform.localPosition.x, blackText.transform.localPosition.y - 75f, 0); // blueTextPre.transform.localPosition = new Vector3(blueText.transform.localPosition.x, blackText.transform.localPosition.y - 75f, 0);
break; break;
case 4: case 4:
greenNodeCountLatest = greenNodeCount + ints[i]; if (ints[i] != 0)
greenText.text = (greenNodeCount + ints[i]).ToString(); greenTextObj.gameObject.SetActive(true);
greenTextPre .gameObject .SetActive(true); greenNodeCountLatest = greenNodeCount.all + ints[i];
greenText.text = (greenNodeCount.origin + ints[i]).ToString();
greenTextPre.text = (greenNodeCount.all + ints[i]).ToString();
/* greenTextPre .gameObject .SetActive(true);
if (ints[i] > 0) if (ints[i] > 0)
{ {
greenTextPre.text = "(" + "+"+ ints[i].ToString() + ")"; greenTextPre.text = "(" + "+"+ ints[i].ToString() + ")";
@ -396,26 +463,31 @@ public class GameManager : Singleton<GameManager>
else else
{ {
greenTextPre.text = "(" + ints[i].ToString() + ")"; greenTextPre.text = "(" + ints[i].ToString() + ")";
} }*/
// greenTextPre.transform.localPosition = new Vector3(greenText.transform.localPosition.x, greenText.transform.localPosition.y - 75f, 0); // greenTextPre.transform.localPosition = new Vector3(greenText.transform.localPosition.x, greenText.transform.localPosition.y - 75f, 0);
break; break;
case 5: case 5:
blackNodeCountLatest = yellowNodeCount.all + ints[i];
blackText.text = (blackNodeCount + ints[i]).ToString(); blackText.text = (blackNodeCount.origin + ints[i]).ToString();
blackTextPre .gameObject .SetActive(true); blueTextPre.text = (blackNodeCount.all + ints[i]).ToString();
if (ints[i] > 0) /* blackTextPre .gameObject .SetActive(true);
{ if (ints[i] > 0)
blackTextPre.text = "(" +"+"+ ints[i].ToString() + ")"; {
} blackTextPre.text = "(" +"+"+ ints[i].ToString() + ")";
else }
{ else
blackTextPre.text = "(" + ints[i].ToString() + ")"; {
} blackTextPre.text = "(" + ints[i].ToString() + ")";
} */
break; break;
case 6: case 6:
metalText.text = (metalNodeCount + ints[i]).ToString(); if (ints[i] != 0)
metalTextPre.gameObject.SetActive(true); metalTextObj.gameObject.SetActive(true);
metalNodeCountLatest = yellowNodeCount.all + ints[i];
metalText.text = (metalNodeCount.origin + ints[i]).ToString();
metalTextPre.text = (metalNodeCount.all + ints[i]).ToString();
/*metalTextPre.gameObject.SetActive(true);
if (ints[i] > 0) if (ints[i] > 0)
{ {
metalTextPre.text = "(" + "+" + ints[i].ToString() + ")"; metalTextPre.text = "(" + "+" + ints[i].ToString() + ")";
@ -423,39 +495,42 @@ public class GameManager : Singleton<GameManager>
else else
{ {
metalTextPre.text = "(" + ints[i].ToString() + ")"; metalTextPre.text = "(" + ints[i].ToString() + ")";
} }*/
// metalTextPre.transform.localPosition = new Vector3(metalText.transform.localPosition.x,metalText.transform.localPosition.y - 75f, 0); // metalTextPre.transform.localPosition = new Vector3(metalText.transform.localPosition.x,metalText.transform.localPosition.y - 75f, 0);
break; break;
case 7: case 7:
yellowNodeCountLatest = yellowNodeCount + ints[i]; if (ints[i] != 0)
yellowText .text = (yellowNodeCount + ints[i]).ToString(); yellowTextObj.gameObject.SetActive(true);
yellowTextPre.gameObject.SetActive(true); yellowNodeCountLatest = yellowNodeCount.all + ints[i];
if (ints[i] > 0) yellowText.text = (yellowNodeCount.origin + ints[i]).ToString();
{ yellowTextPre.text = (yellowNodeCount.all + ints[i]).ToString();
yellowTextPre.text = "(" + "+" + ints[i].ToString() + ")"; /* yellowTextPre.gameObject.SetActive(true);
} if (ints[i] > 0)
else {
{ yellowTextPre.text = "(" + "+" + ints[i].ToString() + ")";
yellowTextPre.text = "(" + ints[i].ToString() + ")"; }
} else
{
// yellowTextPre.transform.localPosition = new Vector3(yellowText.transform.localPosition.x,yellowText.transform.localPosition.y - 75f, 0); yellowTextPre.text = "(" + ints[i].ToString() + ")";
}*/
// yellowTextPre.transform.localPosition = new Vector3(yellowText.transform.localPosition.x,yellowText.transform.localPosition.y - 75f, 0);
break; break;
} }
} }
} }
else else
{ {
redTextPre.gameObject.SetActive(false); /* redTextPre.gameObject.SetActive(false);
whiteTextPre.gameObject.SetActive(false); whiteTextPre.gameObject.SetActive(false);
blueTextPre.gameObject.SetActive(false); blueTextPre.gameObject.SetActive(false);
greenTextPre.gameObject.SetActive(false); greenTextPre.gameObject.SetActive(false);
yellowTextPre .gameObject.SetActive(false); yellowTextPre .gameObject.SetActive(false);
blackTextPre.gameObject.SetActive(false); blackTextPre.gameObject.SetActive(false);
metalTextPre.gameObject.SetActive(false); metalTextPre.gameObject.SetActive(false);*/
// sumPlayerTextPre.gameObject .SetActive(false); // sumPlayerTextPre.gameObject .SetActive(false);
// sumMiddleTextPre.gameObject.SetActive(false); // sumMiddleTextPre.gameObject.SetActive(false);
// sumRightTextPre.gameObject.SetActive(false); // sumRightTextPre.gameObject.SetActive(false);
} }
} }
//ͳ¼Æ³¡µØÑÕÉ« //ͳ¼Æ³¡µØÑÕÉ«

2
ColorlessWorld-2024-4-2/Assets/Scripts/Relic/LegacyNode.cs

@ -32,7 +32,7 @@ public class LegacyNode : MonoBehaviour
{ {
LegacyManager.Instance.legacyNodesList.Add(className, this); LegacyManager.Instance.legacyNodesList.Add(className, this);
} }
GetComponent<Image>().sprite = image; transform.GetChild(1).GetComponent<Image>().sprite = image;
if (isOnGet ) if (isOnGet )
{ {
OnGet(); OnGet();

46
ColorlessWorld-2024-4-2/Assets/Scripts/Tool/getNodeTools.cs

@ -316,26 +316,38 @@ public class getNodeTools
return colorCount; return colorCount;
} }
public static int getNodesOriginCount(string color) public static (int origin,int extra,int all) getNodesOriginCount(int color)
{ {
int colorCount = 0;
(int origin, int extra, int all) colorCount = (0, 0, 0);
switch (color) switch (color)
{ {
case Name.Color.White: case Name.NodeColor.White:
colorCount = MapUnityManager.Instance.whiteNodeCount; break; colorCount.origin = MapUnityManager.Instance.whiteNodeCount;
case Name.Color.Red: break;
colorCount = MapUnityManager.Instance.redNodeCount ; break; case Name.NodeColor.Red:
case Name.Color.Green: colorCount.origin = MapUnityManager.Instance.redNodeCount;
colorCount = MapUnityManager.Instance.greenNodeCount; break; colorCount.extra = MapUnityManager.Instance.extraRedNodeCount;
case Name.Color.Blue: break;
colorCount = MapUnityManager.Instance.blueNodeCount; break; case Name.NodeColor.Green:
case Name.Color.Black: colorCount.origin = MapUnityManager.Instance.greenNodeCount;
colorCount = MapUnityManager.Instance.blackNodeCount; break; break;
case Name.Color.Metal: case Name.NodeColor.Blue:
colorCount = MapUnityManager.Instance.metalNodeCount; break; colorCount.origin = MapUnityManager.Instance.blueNodeCount;
case Name.Color.Yellow: colorCount.extra = MapUnityManager.Instance.extraBlueNodeCount;
colorCount = MapUnityManager.Instance.yellowNodeCount ; break; break;
} case Name.NodeColor.Black:
colorCount.origin = MapUnityManager.Instance.blackNodeCount;
break;
case Name.NodeColor.Metal:
colorCount.origin = MapUnityManager.Instance.metalNodeCount;
break;
case Name.NodeColor.Yellow:
colorCount.origin = MapUnityManager.Instance.yellowNodeCount;
colorCount.extra = MapUnityManager.Instance.extraYellowNodeCount;
break;
}
colorCount.all = colorCount.origin + colorCount.extra;
return colorCount; return colorCount;
} }

Loading…
Cancel
Save