#25 Clone card from card list
This commit is contained in:
parent
89367e7d56
commit
62618284b0
@ -38,7 +38,7 @@ RenderSettings:
|
||||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 0}
|
||||
m_IndirectSpecularColor: {r: 0.35230613, g: 0.6250618, b: 0.99999905, a: 1}
|
||||
m_IndirectSpecularColor: {r: 0.35147578, g: 0.6239672, b: 0.99999905, a: 1}
|
||||
m_UseRadianceAmbientProbe: 0
|
||||
--- !u!157 &4
|
||||
LightmapSettings:
|
||||
@ -16955,6 +16955,12 @@ MonoBehaviour:
|
||||
- {fileID: 21300000, guid: fa70a195a66db4c7fb6180f4205a06b1, type: 3}
|
||||
- {fileID: 21300000, guid: d7aae5ed9e4924be4ac2fe09b2f729a9, type: 3}
|
||||
- {fileID: 21300000, guid: 9180a011ac08440f89deb0b7aa2820f2, type: 3}
|
||||
- {fileID: 21300000, guid: 9180a011ac08440f89deb0b7aa2820f2, type: 3}
|
||||
- {fileID: 21300000, guid: 550b6170d3e5c4cf885cf56fa1df8f6b, type: 3}
|
||||
- {fileID: 21300000, guid: fa70a195a66db4c7fb6180f4205a06b1, type: 3}
|
||||
- {fileID: 21300000, guid: d7aae5ed9e4924be4ac2fe09b2f729a9, type: 3}
|
||||
- {fileID: 21300000, guid: 9180a011ac08440f89deb0b7aa2820f2, type: 3}
|
||||
- {fileID: 21300000, guid: 9180a011ac08440f89deb0b7aa2820f2, type: 3}
|
||||
cursorTexture: {fileID: 2800000, guid: 5d76030a282af4f58a2ea98a00c1172c, type: 3}
|
||||
--- !u!4 &107190135
|
||||
Transform:
|
||||
@ -50767,12 +50773,7 @@ RectTransform:
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 1
|
||||
m_Children:
|
||||
- {fileID: 729135457}
|
||||
- {fileID: 559864560}
|
||||
- {fileID: 1828281918}
|
||||
- {fileID: 2052300733}
|
||||
- {fileID: 1525594843}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2105062291}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
@ -89279,130 +89280,6 @@ Transform:
|
||||
- {fileID: 1978002856}
|
||||
m_Father: {fileID: 320605943}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &559864559
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 332484089}
|
||||
m_Modifications:
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6030931212828352948, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: AssaultCard (1)
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 410908daff8b945d8b8c446cb753408b, type: 3}
|
||||
--- !u!224 &559864560 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 559864559}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &560018365
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -115697,12 +115574,6 @@ SkinnedMeshRenderer:
|
||||
m_Center: {x: -3.084474, y: -0.16242947, z: 0.0013718605}
|
||||
m_Extent: {x: 1.6378536, y: 0.013213575, z: 0.91397595}
|
||||
m_DirtyAABB: 0
|
||||
--- !u!224 &729135457 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 3478816013305318640}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &729532336
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -190131,7 +190002,7 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
m_Bits: 8
|
||||
<MaxGroundDistance>k__BackingField: 2.5
|
||||
<UnitSpacing>k__BackingField: 0.5
|
||||
<UnitSpacing>k__BackingField: 0.8
|
||||
<UnitMatrices>k__BackingField:
|
||||
- units: 0
|
||||
rows: 1
|
||||
@ -238106,130 +237977,6 @@ Transform:
|
||||
- {fileID: 969338606}
|
||||
m_Father: {fileID: 564086955}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &1525594842
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 332484089}
|
||||
m_Modifications:
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6030931212828352948, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: AssaultCard (4)
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 410908daff8b945d8b8c446cb753408b, type: 3}
|
||||
--- !u!224 &1525594843 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1525594842}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1525938286
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -245102,6 +244849,123 @@ MeshFilter:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1573826650}
|
||||
m_Mesh: {fileID: 4300448, guid: 02ded044b8e0963439276550f50be6f9, type: 3}
|
||||
--- !u!1 &1574668126
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1574668128}
|
||||
- component: {fileID: 1574668127}
|
||||
m_Layer: 0
|
||||
m_Name: RainbowHierarchyRuleset
|
||||
m_TagString: EditorOnly
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &1574668127
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1574668126}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -1774853514, guid: ebe26e22332665d4c8332b2a624e5e8b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Rules:
|
||||
- Type: 0
|
||||
Name:
|
||||
GameObject: {fileID: 641420499}
|
||||
Ordinal: 0
|
||||
Priority: 0
|
||||
IconType: 17000
|
||||
IconTexture: {fileID: 0}
|
||||
IsIconRecursive: 0
|
||||
BackgroundType: 0
|
||||
BackgroundTexture: {fileID: 0}
|
||||
IsBackgroundRecursive: 0
|
||||
IsHidden: 0
|
||||
- Type: 0
|
||||
Name:
|
||||
GameObject: {fileID: 1540310982}
|
||||
Ordinal: 1
|
||||
Priority: 0
|
||||
IconType: 1000
|
||||
IconTexture: {fileID: 0}
|
||||
IsIconRecursive: 0
|
||||
BackgroundType: 0
|
||||
BackgroundTexture: {fileID: 0}
|
||||
IsBackgroundRecursive: 0
|
||||
IsHidden: 0
|
||||
- Type: 0
|
||||
Name:
|
||||
GameObject: {fileID: 1228753927}
|
||||
Ordinal: 2
|
||||
Priority: 0
|
||||
IconType: 1000
|
||||
IconTexture: {fileID: 0}
|
||||
IsIconRecursive: 0
|
||||
BackgroundType: 0
|
||||
BackgroundTexture: {fileID: 0}
|
||||
IsBackgroundRecursive: 0
|
||||
IsHidden: 0
|
||||
- Type: 0
|
||||
Name:
|
||||
GameObject: {fileID: 107190133}
|
||||
Ordinal: 3
|
||||
Priority: 0
|
||||
IconType: 1000
|
||||
IconTexture: {fileID: 0}
|
||||
IsIconRecursive: 0
|
||||
BackgroundType: 0
|
||||
BackgroundTexture: {fileID: 0}
|
||||
IsBackgroundRecursive: 0
|
||||
IsHidden: 0
|
||||
- Type: 0
|
||||
Name:
|
||||
GameObject: {fileID: 1234264506}
|
||||
Ordinal: 4
|
||||
Priority: 0
|
||||
IconType: 1000
|
||||
IconTexture: {fileID: 0}
|
||||
IsIconRecursive: 0
|
||||
BackgroundType: 0
|
||||
BackgroundTexture: {fileID: 0}
|
||||
IsBackgroundRecursive: 0
|
||||
IsHidden: 0
|
||||
- Type: 0
|
||||
Name:
|
||||
GameObject: {fileID: 2105062287}
|
||||
Ordinal: 5
|
||||
Priority: 0
|
||||
IconType: 1000
|
||||
IconTexture: {fileID: 0}
|
||||
IsIconRecursive: 0
|
||||
BackgroundType: 0
|
||||
BackgroundTexture: {fileID: 0}
|
||||
IsBackgroundRecursive: 0
|
||||
IsHidden: 0
|
||||
--- !u!4 &1574668128
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1574668126}
|
||||
serializedVersion: 2
|
||||
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: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1574703806
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -286202,130 +286066,6 @@ Transform:
|
||||
- {fileID: 1880432043}
|
||||
m_Father: {fileID: 1942791917}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &1828281917
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 332484089}
|
||||
m_Modifications:
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6030931212828352948, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: AssaultCard (2)
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 410908daff8b945d8b8c446cb753408b, type: 3}
|
||||
--- !u!224 &1828281918 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1828281917}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1828428223
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -292842,7 +292582,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1871370245}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0.67640686, y: 0.00000023841855, z: -0.0000002980232, w: 0.7365282}
|
||||
m_LocalRotation: {x: 0.6764068, y: -0, z: -0, w: 0.7365283}
|
||||
m_LocalPosition: {x: -0.0000002384187, y: 120, z: -10.000001}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
@ -322985,130 +322725,6 @@ SkinnedMeshRenderer:
|
||||
m_Center: {x: -0.06498811, y: 0.020641163, z: 0.00000014901161}
|
||||
m_Extent: {x: 0.5143604, y: 0.28673673, z: 0.7707151}
|
||||
m_DirtyAABB: 0
|
||||
--- !u!1001 &2052300732
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 332484089}
|
||||
m_Modifications:
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6030931212828352948, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: AssaultCard (3)
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 410908daff8b945d8b8c446cb753408b, type: 3}
|
||||
--- !u!224 &2052300733 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2052300732}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &2053990539
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -338947,142 +338563,24 @@ MeshCollider:
|
||||
m_Convex: 1
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: 43255131788321556, guid: 89cd1f768c41d774582ead143be71c37, type: 2}
|
||||
--- !u!1001 &3478816013305318640
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 332484089}
|
||||
m_Modifications:
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5503671027645874491, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6030931212828352948, guid: 410908daff8b945d8b8c446cb753408b,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: AssaultCard
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 410908daff8b945d8b8c446cb753408b, type: 3}
|
||||
--- !u!1660057539 &9223372036854775807
|
||||
SceneRoots:
|
||||
m_ObjectHideFlags: 0
|
||||
m_Roots:
|
||||
- {fileID: 776161958}
|
||||
- {fileID: 1341654437}
|
||||
- {fileID: 1036440296}
|
||||
- {fileID: 1861343896}
|
||||
- {fileID: 734248431}
|
||||
- {fileID: 641420500}
|
||||
- {fileID: 1540310984}
|
||||
- {fileID: 1228753929}
|
||||
- {fileID: 107190135}
|
||||
- {fileID: 1234264508}
|
||||
- {fileID: 2105062291}
|
||||
- {fileID: 1341654437}
|
||||
- {fileID: 1560348101}
|
||||
- {fileID: 476261175}
|
||||
- {fileID: 1181634882}
|
||||
- {fileID: 107190135}
|
||||
- {fileID: 692722753}
|
||||
- {fileID: 888439616}
|
||||
- {fileID: 200595900}
|
||||
@ -339092,3 +338590,4 @@ SceneRoots:
|
||||
- {fileID: 1994033914}
|
||||
- {fileID: 342641572}
|
||||
- {fileID: 99817019}
|
||||
- {fileID: 1574668128}
|
||||
|
@ -227,7 +227,7 @@ namespace BlueWaterProject
|
||||
/// </summary>
|
||||
public UnitController CreateUnit(string cardIdx, AttackerType attackerType)
|
||||
{
|
||||
var card = DataManager.Inst.GetCardDictionaryKey(cardIdx);
|
||||
var card = DataManager.Inst.GetCardDictionaryFromKey(cardIdx);
|
||||
var unit = DataManager.Inst.GetUnitDictionaryKey(card.UnitIdx);
|
||||
var captainStat = DataManager.Inst.GetAiStatDictionaryKey(unit.CaptainStatIdx);
|
||||
var sailorStat = DataManager.Inst.GetAiStatDictionaryKey(unit.SailorStatIdx);
|
||||
|
@ -1,6 +1,7 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using BlueWaterProject;
|
||||
using UnityEngine;
|
||||
using UnityEngine.AI;
|
||||
using UnityEngine.Animations;
|
||||
@ -17,9 +18,10 @@ public class Boat : MonoBehaviour
|
||||
public SpriteRenderer TypeCardSprite { get; private set; }
|
||||
private LookAtConstraint typeCardLookAtConstraint;
|
||||
|
||||
public Vector3 target { get; set; }
|
||||
|
||||
public delegate void LandedEventHandler();
|
||||
public Vector3 Target { get; set; }
|
||||
public string CardIndex { get; set; }
|
||||
|
||||
public delegate void LandedEventHandler(string cardIndex, AttackerType attackerType, Vector3 assignPos);
|
||||
public event LandedEventHandler OnLanded;
|
||||
|
||||
private void Awake()
|
||||
@ -39,10 +41,10 @@ public class Boat : MonoBehaviour
|
||||
|
||||
private void Start()
|
||||
{
|
||||
agent.SetDestination(target);
|
||||
agent.SetDestination(Target);
|
||||
|
||||
spot.gameObject.SetActive(true);
|
||||
spot.transform.position = target;
|
||||
spot.transform.position = Target;
|
||||
|
||||
if (draw != null) StopCoroutine(draw);
|
||||
draw = StartCoroutine(DrawPath());
|
||||
@ -65,7 +67,7 @@ public class Boat : MonoBehaviour
|
||||
lineRenderer.enabled = false;
|
||||
if (draw != null) StopCoroutine(draw);
|
||||
|
||||
OnLanded?.Invoke();
|
||||
OnLanded?.Invoke(CardIndex, AttackerType.OFFENSE, Target);
|
||||
Destroy(gameObject);
|
||||
}
|
||||
|
||||
|
@ -1,5 +1,6 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using _02.Scripts.WaterAndShip;
|
||||
using BlueWaterProject;
|
||||
using Sirenix.OdinInspector;
|
||||
using UnityEngine;
|
||||
@ -8,10 +9,12 @@ using UnityEngine.UI;
|
||||
|
||||
public class DraggableCard : MonoBehaviour, IPointerDownHandler, IDragHandler, IPointerUpHandler
|
||||
{
|
||||
[Title("Card")]
|
||||
private Vector3 originalPosition;
|
||||
private Vector3 originalScale;
|
||||
private CanvasGroup canvasGroup;
|
||||
private GameObject border;
|
||||
public Card card;
|
||||
|
||||
[Title("Child Object")]
|
||||
private Image typeImage;
|
||||
@ -30,7 +33,12 @@ public class DraggableCard : MonoBehaviour, IPointerDownHandler, IDragHandler, I
|
||||
private void Start()
|
||||
{
|
||||
canvasGroup = GetComponent<CanvasGroup>();
|
||||
typeImage.sprite = DataManager.Inst.cardType[UnityEngine.Random.Range(0, DataManager.Inst.cardType.Length)];
|
||||
}
|
||||
|
||||
public void CardInit()
|
||||
{
|
||||
var cardInfo = DataManager.Inst.GetUnitDictionaryKey(card.UnitIdx);
|
||||
typeImage.sprite = DataManager.Inst.cardType[(int)cardInfo.UnitType];
|
||||
}
|
||||
|
||||
public void OnPointerDown(PointerEventData eventData)
|
||||
@ -90,8 +98,9 @@ public class DraggableCard : MonoBehaviour, IPointerDownHandler, IDragHandler, I
|
||||
|
||||
var boat = obj.GetComponent<Boat>();
|
||||
boat.TypeCardSprite.sprite = typeImage.sprite;
|
||||
boat.target = hit.point;
|
||||
//boat.OnLanded += UnitManager.Inst.AssignUnit();
|
||||
boat.Target = hit.point;
|
||||
boat.CardIndex = card.Idx;
|
||||
boat.OnLanded += UnitManager.Inst.CreateAndAssign;
|
||||
|
||||
return true;
|
||||
|
||||
|
@ -66,7 +66,7 @@ public class DataManager : Singleton<DataManager>
|
||||
public AiStat GetAiStatDictionaryKey(string idx) => aiStatDictionary[idx] != null ? aiStatDictionary[idx] : null;
|
||||
public Unit GetUnitDictionaryKey(string idx) => unitDictionary[idx] != null ? unitDictionary[idx] : null;
|
||||
public Unit GetEnemyUnitDictionaryKey(string idx) => enemyUnitDictionary[idx] != null ? enemyUnitDictionary[idx] : null;
|
||||
public Card GetCardDictionaryKey(string idx) => cardDictionary[idx] != null ? cardDictionary[idx] : null;
|
||||
public Card GetCardDictionaryFromKey(string idx) => cardDictionary[idx] != null ? cardDictionary[idx] : null;
|
||||
|
||||
#if UNITY_EDITOR
|
||||
public AiView GetAiViewSoKey(string idx) => AiViewDataSo.aiViewDataList.Find(item => item.Idx == idx);
|
||||
|
@ -8,6 +8,7 @@ using UnityEngine;
|
||||
|
||||
public class UiManager : Singleton<UiManager>
|
||||
{
|
||||
[Title("Card")]
|
||||
private Transform cardLayoutGroup;
|
||||
public UIAnimator CardLayoutGroupAnimator { get; set; }
|
||||
|
||||
@ -30,18 +31,11 @@ public class UiManager : Singleton<UiManager>
|
||||
|
||||
private void Start()
|
||||
{
|
||||
cursorTexture = DataManager.Inst.cursorTexture;
|
||||
Cursor.SetCursor(cursorTexture, Vector2.zero, CursorMode.Auto);
|
||||
CursorTextureChange();
|
||||
AssaultCardInit();
|
||||
}
|
||||
|
||||
// private void OnGUI()
|
||||
// {
|
||||
// if (isTakeAim) return;
|
||||
// Vector2 mousePosition = new Vector2(Input.mousePosition.x, Screen.height - Input.mousePosition.y);
|
||||
// GUI.DrawTexture(new Rect(mousePosition.x, mousePosition.y, cursorTexture.width, cursorTexture.height), cursorTexture);
|
||||
// }
|
||||
|
||||
public void AddCard()
|
||||
public void AddCard() //TODO Test button and function, delete later
|
||||
{
|
||||
Instantiate(DataManager.Inst.assaultCard, cardLayoutGroup);
|
||||
}
|
||||
@ -51,4 +45,21 @@ public class UiManager : Singleton<UiManager>
|
||||
takeAim.SetActive(isOn);
|
||||
isTakeAim = isOn;
|
||||
}
|
||||
|
||||
private void CursorTextureChange()
|
||||
{
|
||||
cursorTexture = DataManager.Inst.cursorTexture;
|
||||
Cursor.SetCursor(cursorTexture, Vector2.zero, CursorMode.Auto);
|
||||
}
|
||||
|
||||
private void AssaultCardInit()
|
||||
{
|
||||
for (int i = 0; i < DataManager.Inst.CardList.Count; i++)
|
||||
{
|
||||
var obj = Instantiate(DataManager.Inst.assaultCard, cardLayoutGroup);
|
||||
var draggableCard = obj.GetComponent<DraggableCard>();
|
||||
draggableCard.card = DataManager.Inst.GetCardDictionaryFromKey(DataManager.Inst.CardList[i]);
|
||||
draggableCard.CardInit();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a55ee4efaad27d948ba5f03fc6d7bc80
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ed9b95dc6ed6d0647ad7f1a8f305385d
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4ff1f29eab234cf4490d9bb383892c44
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 697b6e7dea1fde146b7e3e5cf3ed9e9f
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 078b8f13a17171b49892ad10426d5af0
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f9406a33814af9c47b352e77f079d798
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 9aacf6f3043624194bb6f6fe9a580786
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f4227764308e84f89a765fbf315e2945
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 41e59f562b69648719f2424c438758f3
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b044a2387a61dac41bdf204adffdce9d
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: cd287c84e887ea24a8679e67aac7c074
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 5f3f53ee059b45a4d9a5b9fc75e8aea9
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f211254f5bfad224ba88868f2c75432c
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4368c9be31b3c174dbfd80f2caf98889
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
9
BlueWater/Assets/Plugins/Borodar.meta
Normal file
9
BlueWater/Assets/Plugins/Borodar.meta
Normal file
@ -0,0 +1,9 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2d179837d2a8d734fb2f73b344de6e74
|
||||
folderAsset: yes
|
||||
timeCreated: 1513687599
|
||||
licenseType: Store
|
||||
DefaultImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
9
BlueWater/Assets/Plugins/Borodar/RainbowHierarchy.meta
Normal file
9
BlueWater/Assets/Plugins/Borodar/RainbowHierarchy.meta
Normal file
@ -0,0 +1,9 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2a4d4f8eda471674d93ce958ae95ac9f
|
||||
folderAsset: yes
|
||||
timeCreated: 1502704768
|
||||
licenseType: Store
|
||||
DefaultImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b983b7e0989a1ad478ad6bd12eb6a0a7
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
@ -0,0 +1,102 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ebe26e22332665d4c8332b2a624e5e8b
|
||||
PluginImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
iconMap: {}
|
||||
executionOrder: {}
|
||||
defineConstraints: []
|
||||
isPreloaded: 0
|
||||
isOverridable: 0
|
||||
isExplicitlyReferenced: 0
|
||||
validateReferences: 1
|
||||
platformData:
|
||||
- first:
|
||||
: Any
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
Exclude Editor: 0
|
||||
Exclude Linux: 1
|
||||
Exclude Linux64: 1
|
||||
Exclude LinuxUniversal: 1
|
||||
Exclude OSXUniversal: 1
|
||||
Exclude Win: 1
|
||||
Exclude Win64: 1
|
||||
- first:
|
||||
Any:
|
||||
second:
|
||||
enabled: 0
|
||||
settings: {}
|
||||
- first:
|
||||
Editor: Editor
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
DefaultValueInitialized: true
|
||||
OS: AnyOS
|
||||
- first:
|
||||
Facebook: Win
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
- first:
|
||||
Facebook: Win64
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
- first:
|
||||
Standalone: Linux
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: x86
|
||||
- first:
|
||||
Standalone: Linux64
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
- first:
|
||||
Standalone: LinuxUniversal
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: None
|
||||
- first:
|
||||
Standalone: OSXUniversal
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
- first:
|
||||
Standalone: Win
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
- first:
|
||||
Standalone: Win64
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
- first:
|
||||
Windows Store Apps: WindowsStoreApps
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 106670
|
||||
packageName: Rainbow Hierarchy 2
|
||||
packageVersion: 2.6.1
|
||||
assetPath: Assets/Plugins/Borodar/RainbowHierarchy/Assemblies/RainbowHierarchy.dll
|
||||
uploadId: 605240
|
@ -0,0 +1,9 @@
|
||||
fileFormatVersion: 2
|
||||
guid: dbfe44c214995e6429ff6d5ee0ea5805
|
||||
folderAsset: yes
|
||||
timeCreated: 1502706471
|
||||
licenseType: Store
|
||||
DefaultImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,15 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 31f20cb97742f2f4d948452249a89d6d
|
||||
timeCreated: 1502706485
|
||||
licenseType: Store
|
||||
DefaultImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 106670
|
||||
packageName: Rainbow Hierarchy 2
|
||||
packageVersion: 2.6.1
|
||||
assetPath: Assets/Plugins/Borodar/RainbowHierarchy/Demo/DemoColors.unity
|
||||
uploadId: 605240
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,15 @@
|
||||
fileFormatVersion: 2
|
||||
guid: aa2219c016490de4ea3249875a0fdc97
|
||||
timeCreated: 1502706485
|
||||
licenseType: Store
|
||||
DefaultImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 106670
|
||||
packageName: Rainbow Hierarchy 2
|
||||
packageVersion: 2.6.1
|
||||
assetPath: Assets/Plugins/Borodar/RainbowHierarchy/Demo/DemoComponents.unity
|
||||
uploadId: 605240
|
@ -0,0 +1,6 @@
|
||||
This software includes third-party software subject to the associated copyrights, as follows:
|
||||
|
||||
Name: Unity-Reorderable-List
|
||||
Repo: https://github.com/cfoulston/Unity-Reorderable-List
|
||||
License: MIT (https://github.com/cfoulston/Unity-Reorderable-List/blob/master/LICENSE)
|
||||
Copyright (c) 2017 Chris Foulston
|
@ -0,0 +1,14 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ed55eaf159fe82c4c880fc3bc9dcaa2f
|
||||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 106670
|
||||
packageName: Rainbow Hierarchy 2
|
||||
packageVersion: 2.6.1
|
||||
assetPath: Assets/Plugins/Borodar/RainbowHierarchy/NOTICES.txt
|
||||
uploadId: 605240
|
BIN
BlueWater/Assets/Plugins/Borodar/RainbowHierarchy/QuickStart.pdf
Normal file
BIN
BlueWater/Assets/Plugins/Borodar/RainbowHierarchy/QuickStart.pdf
Normal file
Binary file not shown.
@ -0,0 +1,16 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 10bd101648f62f34c97e8133a89f045c
|
||||
timeCreated: 1512745111
|
||||
licenseType: Store
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 106670
|
||||
packageName: Rainbow Hierarchy 2
|
||||
packageVersion: 2.6.1
|
||||
assetPath: Assets/Plugins/Borodar/RainbowHierarchy/QuickStart.pdf
|
||||
uploadId: 605240
|
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 40357b4bd9471214281151163e441314
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -0,0 +1,14 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 617b3f1032a08c14ebfedfa340767cdf
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 106670
|
||||
packageName: Rainbow Hierarchy 2
|
||||
packageVersion: 2.6.1
|
||||
assetPath: Assets/Plugins/Borodar/RainbowHierarchy/Source/RainbowHierarchy.src.unitypackage
|
||||
uploadId: 605240
|
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f597f19f656ba56eae4f6a3a7cc528f4
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 48e08dc33330d11e9d4a1b246c52e4f6
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ed09910c0094cb27be8f3ca264680da3
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: cc355dd4cf1e6173beaeb22c2858cbe1
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Loading…
Reference in New Issue
Block a user