diff --git a/.idea/.idea.bansonic_beta_main/.idea/encodings.xml b/.idea/.idea.bansonic_beta_main/.idea/encodings.xml new file mode 100644 index 00000000..df87cf95 --- /dev/null +++ b/.idea/.idea.bansonic_beta_main/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Assets/Resources/TeamCharacters/CharacterImg.meta b/Assets/Resources/TeamCharacters/1001001_YUETAO.meta similarity index 77% rename from Assets/Resources/TeamCharacters/CharacterImg.meta rename to Assets/Resources/TeamCharacters/1001001_YUETAO.meta index 270ff24f..fd4918d6 100644 --- a/Assets/Resources/TeamCharacters/CharacterImg.meta +++ b/Assets/Resources/TeamCharacters/1001001_YUETAO.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1d4a3fcc2d2f7ec44a2bfa912a0b2904 +guid: d5bd7209fbae23e46924c2911c444eac folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Resources/TeamCharacters/1001001_YUETAO/1001001_YUETAO.asset b/Assets/Resources/TeamCharacters/1001001_YUETAO/1001001_YUETAO.asset new file mode 100644 index 00000000..e06bfd89 --- /dev/null +++ b/Assets/Resources/TeamCharacters/1001001_YUETAO/1001001_YUETAO.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5976726b6b1585d4bae159d4a817b84e, type: 3} + m_Name: 1001001_YUETAO + m_EditorClassIdentifier: + CharacterID: 1001001 + CharacterSkillName: pure dissidents + CharacterCardSprite: {fileID: 21300000, guid: 4cfddbb3f863ce7438489672608b52e7, type: 3} + CharacterTeamSprite: {fileID: 21300000, guid: cd700eadb08fd5a4289093677d9414ff, type: 3} + CharacterRoleSprite: {fileID: 21300000, guid: 723b47d046dd2e644a87c48049c6cd7b, type: 3} diff --git a/Assets/Resources/TeamCharacters/1001001_YUETAO/1001001_YUETAO.asset.meta b/Assets/Resources/TeamCharacters/1001001_YUETAO/1001001_YUETAO.asset.meta new file mode 100644 index 00000000..c1a91448 --- /dev/null +++ b/Assets/Resources/TeamCharacters/1001001_YUETAO/1001001_YUETAO.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bc37529925b6b414f801a85c12c80f6d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/TeamCharacters/CharacterImg/YUETAO.png b/Assets/Resources/TeamCharacters/1001001_YUETAO/Character.png similarity index 100% rename from Assets/Resources/TeamCharacters/CharacterImg/YUETAO.png rename to Assets/Resources/TeamCharacters/1001001_YUETAO/Character.png diff --git a/Assets/Resources/TeamCharacters/CharacterImg/YUETAO.png.meta b/Assets/Resources/TeamCharacters/1001001_YUETAO/Character.png.meta similarity index 100% rename from Assets/Resources/TeamCharacters/CharacterImg/YUETAO.png.meta rename to Assets/Resources/TeamCharacters/1001001_YUETAO/Character.png.meta diff --git a/Assets/Resources/TeamCharacters/TeamCharacterImg/YUETAO.png b/Assets/Resources/TeamCharacters/1001001_YUETAO/TeamCharacter.png similarity index 100% rename from Assets/Resources/TeamCharacters/TeamCharacterImg/YUETAO.png rename to Assets/Resources/TeamCharacters/1001001_YUETAO/TeamCharacter.png diff --git a/Assets/Resources/TeamCharacters/TeamCharacterImg/YUETAO.png.meta b/Assets/Resources/TeamCharacters/1001001_YUETAO/TeamCharacter.png.meta similarity index 100% rename from Assets/Resources/TeamCharacters/TeamCharacterImg/YUETAO.png.meta rename to Assets/Resources/TeamCharacters/1001001_YUETAO/TeamCharacter.png.meta diff --git a/Assets/Resources/TeamCharacters/OccupationIcon/default.png b/Assets/Resources/TeamCharacters/1001001_YUETAO/default.png similarity index 100% rename from Assets/Resources/TeamCharacters/OccupationIcon/default.png rename to Assets/Resources/TeamCharacters/1001001_YUETAO/default.png diff --git a/Assets/Resources/TeamCharacters/1001001_YUETAO/default.png.meta b/Assets/Resources/TeamCharacters/1001001_YUETAO/default.png.meta new file mode 100644 index 00000000..ac50ce69 --- /dev/null +++ b/Assets/Resources/TeamCharacters/1001001_YUETAO/default.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 723b47d046dd2e644a87c48049c6cd7b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/TeamCharacters/OccupationIcon.meta b/Assets/Resources/TeamCharacters/1001002_AYANO.meta similarity index 77% rename from Assets/Resources/TeamCharacters/OccupationIcon.meta rename to Assets/Resources/TeamCharacters/1001002_AYANO.meta index be10ad4a..3d8b66e7 100644 --- a/Assets/Resources/TeamCharacters/OccupationIcon.meta +++ b/Assets/Resources/TeamCharacters/1001002_AYANO.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 95465072ce16290438ddc7e63bbd869d +guid: 5a0f05813786f074cb3266c66bc83aa2 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Resources/TeamCharacters/1001002_AYANO/1001002_AYANO.asset b/Assets/Resources/TeamCharacters/1001002_AYANO/1001002_AYANO.asset new file mode 100644 index 00000000..e9db5522 --- /dev/null +++ b/Assets/Resources/TeamCharacters/1001002_AYANO/1001002_AYANO.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5976726b6b1585d4bae159d4a817b84e, type: 3} + m_Name: 1001002_AYANO + m_EditorClassIdentifier: + CharacterID: 1001002 + CharacterSkillName: default skill + CharacterCardSprite: {fileID: 21300000, guid: 84ef05cda680d7a40a5108f0a5bcc1c9, type: 3} + CharacterTeamSprite: {fileID: 21300000, guid: 63011e948d89eac418c08986d70e15cb, type: 3} + CharacterRoleSprite: {fileID: 21300000, guid: d43848ae23ea61941bafe55e1a6fd78f, type: 3} diff --git a/Assets/Resources/TeamCharacters/1001002_AYANO/1001002_AYANO.asset.meta b/Assets/Resources/TeamCharacters/1001002_AYANO/1001002_AYANO.asset.meta new file mode 100644 index 00000000..fb516eef --- /dev/null +++ b/Assets/Resources/TeamCharacters/1001002_AYANO/1001002_AYANO.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8e5e7d1ca158e7c498293a6518a09163 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/TeamCharacters/CharacterImg/AYANO.png b/Assets/Resources/TeamCharacters/1001002_AYANO/Character.png similarity index 100% rename from Assets/Resources/TeamCharacters/CharacterImg/AYANO.png rename to Assets/Resources/TeamCharacters/1001002_AYANO/Character.png diff --git a/Assets/Resources/TeamCharacters/CharacterImg/AYANO.png.meta b/Assets/Resources/TeamCharacters/1001002_AYANO/Character.png.meta similarity index 100% rename from Assets/Resources/TeamCharacters/CharacterImg/AYANO.png.meta rename to Assets/Resources/TeamCharacters/1001002_AYANO/Character.png.meta diff --git a/Assets/Resources/TeamCharacters/TeamCharacterImg/AYANO.png b/Assets/Resources/TeamCharacters/1001002_AYANO/TeamCharacter.png similarity index 100% rename from Assets/Resources/TeamCharacters/TeamCharacterImg/AYANO.png rename to Assets/Resources/TeamCharacters/1001002_AYANO/TeamCharacter.png diff --git a/Assets/Resources/TeamCharacters/TeamCharacterImg/AYANO.png.meta b/Assets/Resources/TeamCharacters/1001002_AYANO/TeamCharacter.png.meta similarity index 100% rename from Assets/Resources/TeamCharacters/TeamCharacterImg/AYANO.png.meta rename to Assets/Resources/TeamCharacters/1001002_AYANO/TeamCharacter.png.meta diff --git a/Assets/Resources/TeamCharacters/1001002_AYANO/default.png b/Assets/Resources/TeamCharacters/1001002_AYANO/default.png new file mode 100644 index 00000000..64eb9602 Binary files /dev/null and b/Assets/Resources/TeamCharacters/1001002_AYANO/default.png differ diff --git a/Assets/Resources/TeamCharacters/OccupationIcon/default.png.meta b/Assets/Resources/TeamCharacters/1001002_AYANO/default.png.meta similarity index 100% rename from Assets/Resources/TeamCharacters/OccupationIcon/default.png.meta rename to Assets/Resources/TeamCharacters/1001002_AYANO/default.png.meta diff --git a/Assets/Resources/TeamCharacters/levelIcon/CharacterLevelData.asset b/Assets/Resources/TeamCharacters/levelIcon/CharacterLevelData.asset new file mode 100644 index 00000000..0c6cf3ac --- /dev/null +++ b/Assets/Resources/TeamCharacters/levelIcon/CharacterLevelData.asset @@ -0,0 +1,18 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b6283ed431b50f749a644d480b0bc324, type: 3} + m_Name: CharacterLevelData + m_EditorClassIdentifier: + LevelCSprite: {fileID: 21300000, guid: cc6dc195a4e12f74e93a76d0a812c100, type: 3} + LevelSSprite: {fileID: 21300000, guid: c27f07a6da5b8fb43ac4078c5b2ef709, type: 3} + LevelASprite: {fileID: 21300000, guid: c38c5a615d5391a47addbe393458a6b6, type: 3} + LevelBSprite: {fileID: 21300000, guid: 2b45e5a0ca8df1642bc994c53374988a, type: 3} diff --git a/Assets/Resources/TeamCharacters/levelIcon/CharacterLevelData.asset.meta b/Assets/Resources/TeamCharacters/levelIcon/CharacterLevelData.asset.meta new file mode 100644 index 00000000..f9e551b6 --- /dev/null +++ b/Assets/Resources/TeamCharacters/levelIcon/CharacterLevelData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c36bd33a1b5f5f34d9b0d2750119d910 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Songs_Select.unity b/Assets/Scenes/Songs_Select.unity index 18759653..3e7a3958 100644 --- a/Assets/Scenes/Songs_Select.unity +++ b/Assets/Scenes/Songs_Select.unity @@ -329,6 +329,7 @@ GameObject: - component: {fileID: 16906200} - component: {fileID: 16906199} - component: {fileID: 16906198} + - component: {fileID: 16906201} m_Layer: 5 m_Name: team_SettingPanel m_TagString: Untagged @@ -421,126 +422,29 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 3 m_TargetDisplay: 0 ---- !u!1 &36876044 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 36876045} - - component: {fileID: 36876048} - - component: {fileID: 36876047} - - component: {fileID: 36876046} - m_Layer: 5 - m_Name: level - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &36876045 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 36876044} - 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: 2122860487} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.01914089, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -58.1064, y: -90.961} - m_SizeDelta: {x: -118.4853, y: -181.92} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &36876046 +--- !u!114 &16906201 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 36876044} + m_GameObject: {fileID: 16906196} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Script: {fileID: 11500000, guid: dc980b2fad60d68478fe827374aaf209, type: 3} m_Name: m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 36876047} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &36876047 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 36876044} - 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: cc6dc195a4e12f74e93a76d0a812c100, 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!222 &36876048 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 36876044} - m_CullTransparentMesh: 1 + teamSettingPanelObj: {fileID: 16906196} + teamElementsObj: + - {fileID: 1712599086} + - {fileID: 847674718} + - {fileID: 1221530200} + - {fileID: 826634046} + - {fileID: 973852806} + teamCharacterList: {fileID: 11400000, guid: 74a349c5a048ac54da419a61dabd9ab6, type: 2} + teamCharacterLevelData: {fileID: 11400000, guid: c36bd33a1b5f5f34d9b0d2750119d910, type: 2} + teamCharacterPrefab: {fileID: 2949374534111508497, guid: 2b0df49c627c9b84fb585add14c2dfa9, type: 3} + teamCharacterViewContent: {fileID: 1704085228} --- !u!1 &54722882 GameObject: m_ObjectHideFlags: 0 @@ -847,7 +751,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Purge dissidents + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c95ab61f13e39254e8e3cbf4059d88c5, type: 2} m_sharedMaterial: {fileID: 4492750392876140565, guid: c95ab61f13e39254e8e3cbf4059d88c5, type: 2} @@ -1058,11 +962,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 99981639} m_CullTransparentMesh: 1 ---- !u!224 &127176247 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6068646603734489704, guid: 2b0df49c627c9b84fb585add14c2dfa9, type: 3} - m_PrefabInstance: {fileID: 7967908447032725239} - m_PrefabAsset: {fileID: 0} --- !u!1 &136385174 GameObject: m_ObjectHideFlags: 0 @@ -6065,126 +5964,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 673773722} m_CullTransparentMesh: 1 ---- !u!1 &677413413 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 677413414} - - component: {fileID: 677413417} - - component: {fileID: 677413416} - - component: {fileID: 677413415} - m_Layer: 5 - m_Name: level - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &677413414 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 677413413} - 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: 1987368278} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.01914089, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -58.1064, y: -90.961} - m_SizeDelta: {x: -118.4853, y: -181.92} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &677413415 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 677413413} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 677413416} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &677413416 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 677413413} - 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: cc6dc195a4e12f74e93a76d0a812c100, 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!222 &677413417 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 677413413} - m_CullTransparentMesh: 1 --- !u!1 &687127898 GameObject: m_ObjectHideFlags: 0 @@ -6959,7 +6738,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: default Skil + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c95ab61f13e39254e8e3cbf4059d88c5, type: 2} m_sharedMaterial: {fileID: 4492750392876140565, guid: c95ab61f13e39254e8e3cbf4059d88c5, type: 2} @@ -8098,11 +7877,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5fe33ff09d0ea4848ac88809df94dbc8, type: 3} m_Name: m_EditorClassIdentifier: + characterID: 0 character: {fileID: 826634046} controlButton: {fileID: 1026893374} levelIcon: {fileID: 1243909241} charcterImg: {fileID: 585142737} - leaderStatusIcon: {fileID: 0} skillName: {fileID: 2087826253} isLeader: {fileID: 993954737} notLeader: {fileID: 1607855917} @@ -8376,7 +8155,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: default Skil + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c95ab61f13e39254e8e3cbf4059d88c5, type: 2} m_sharedMaterial: {fileID: 4492750392876140565, guid: c95ab61f13e39254e8e3cbf4059d88c5, type: 2} @@ -8566,11 +8345,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5fe33ff09d0ea4848ac88809df94dbc8, type: 3} m_Name: m_EditorClassIdentifier: + characterID: 0 character: {fileID: 847674718} controlButton: {fileID: 848812486} levelIcon: {fileID: 1159523091} charcterImg: {fileID: 1800876332} - leaderStatusIcon: {fileID: 0} skillName: {fileID: 839320577} isLeader: {fileID: 2044499926} notLeader: {fileID: 1530573770} @@ -9852,81 +9631,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 932312735} m_CullTransparentMesh: 1 ---- !u!1 &942863505 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 942863506} - - component: {fileID: 942863508} - - component: {fileID: 942863507} - m_Layer: 5 - m_Name: RightIcon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &942863506 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 942863505} - 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: 2122860487} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.01914089, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 61.827393, y: 92.13159} - m_SizeDelta: {x: -113.0898, y: -180.0144} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &942863507 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 942863505} - 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: d43848ae23ea61941bafe55e1a6fd78f, 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!222 &942863508 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 942863505} - m_CullTransparentMesh: 1 --- !u!1 &973852806 GameObject: m_ObjectHideFlags: 0 @@ -10040,11 +9744,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5fe33ff09d0ea4848ac88809df94dbc8, type: 3} m_Name: m_EditorClassIdentifier: + characterID: 0 character: {fileID: 973852806} controlButton: {fileID: 534532748} levelIcon: {fileID: 2082407423} charcterImg: {fileID: 1228437759} - leaderStatusIcon: {fileID: 0} skillName: {fileID: 1184725132} isLeader: {fileID: 1374386275} notLeader: {fileID: 1713384185} @@ -10417,81 +10121,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 993954737} m_CullTransparentMesh: 1 ---- !u!1 &1005912079 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1005912080} - - component: {fileID: 1005912082} - - component: {fileID: 1005912081} - m_Layer: 5 - m_Name: RightIcon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1005912080 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1005912079} - 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: 1987368278} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.01914089, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 61.827393, y: 92.13159} - m_SizeDelta: {x: -113.0898, y: -180.0144} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1005912081 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1005912079} - 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: d43848ae23ea61941bafe55e1a6fd78f, 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!222 &1005912082 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1005912079} - m_CullTransparentMesh: 1 --- !u!1 &1012221208 GameObject: m_ObjectHideFlags: 0 @@ -11066,126 +10695,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1039149939} m_CullTransparentMesh: 1 ---- !u!1 &1077432358 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1077432359} - - component: {fileID: 1077432362} - - component: {fileID: 1077432361} - - component: {fileID: 1077432360} - m_Layer: 5 - m_Name: leftIcon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1077432359 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1077432358} - 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: 2122860487} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.01914089, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -66.14577, y: 99.046} - m_SizeDelta: {x: -133.4546, y: -193.8428} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1077432360 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1077432358} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1077432361} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1077432361 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1077432358} - 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: 785cf3c544449b54b908cfaea02d4864, 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!222 &1077432362 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1077432358} - m_CullTransparentMesh: 1 --- !u!1 &1082142845 GameObject: m_ObjectHideFlags: 0 @@ -12272,7 +11781,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: default Skil + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c95ab61f13e39254e8e3cbf4059d88c5, type: 2} m_sharedMaterial: {fileID: 4492750392876140565, guid: c95ab61f13e39254e8e3cbf4059d88c5, type: 2} @@ -12924,11 +12433,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5fe33ff09d0ea4848ac88809df94dbc8, type: 3} m_Name: m_EditorClassIdentifier: + characterID: 0 character: {fileID: 1221530200} controlButton: {fileID: 2061794728} levelIcon: {fileID: 1902451278} charcterImg: {fileID: 492571258} - leaderStatusIcon: {fileID: 0} skillName: {fileID: 751424667} isLeader: {fileID: 325740963} notLeader: {fileID: 164420411} @@ -13279,81 +12788,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1245531101} m_CullTransparentMesh: 1 ---- !u!1 &1362212621 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1362212622} - - component: {fileID: 1362212624} - - component: {fileID: 1362212623} - m_Layer: 5 - m_Name: image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1362212622 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1362212621} - 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: 2122860487} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 4.9328613, y: -3.8088684} - m_SizeDelta: {x: 0.7026062, y: 11.866501} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1362212623 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1362212621} - 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: 4cfddbb3f863ce7438489672608b52e7, 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!222 &1362212624 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1362212621} - m_CullTransparentMesh: 1 --- !u!1 &1366441508 GameObject: m_ObjectHideFlags: 0 @@ -14368,8 +13802,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1593528873} - m_TargetAssemblyTypeName: teamSettingPanel, Assembly-CSharp + - m_Target: {fileID: 1593528872} + m_TargetAssemblyTypeName: TeamManager, Assembly-CSharp m_MethodName: openTeamSettingPanel m_Mode: 1 m_Arguments: @@ -15557,7 +14991,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1593528874} - - component: {fileID: 1593528873} - component: {fileID: 1593528872} m_Layer: 0 m_Name: TeamManger @@ -15578,30 +15011,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: debeba9c3c2f7334ab04c769534a1f85, type: 3} m_Name: m_EditorClassIdentifier: - teamSettingPanelInstance: {fileID: 0} + teamSettingPanelInstance: {fileID: 16906201} currentSelectedTeam: 0 currentSelectedCharacter: -1 ---- !u!114 &1593528873 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1593528871} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc980b2fad60d68478fe827374aaf209, type: 3} - m_Name: - m_EditorClassIdentifier: - teamSettingPanelObj: {fileID: 16906196} - teamElementsObj: - - {fileID: 1712599086} - - {fileID: 847674718} - - {fileID: 1221530200} - - {fileID: 826634046} - - {fileID: 973852806} - teamCharacterPrefab: {fileID: 2949374534111508497, guid: 2b0df49c627c9b84fb585add14c2dfa9, type: 3} - teamCharacterViewContent: {fileID: 1704085228} --- !u!4 &1593528874 Transform: m_ObjectHideFlags: 0 @@ -16961,16 +16373,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1987368278} - - {fileID: 127176247} - - {fileID: 2122860487} + m_Children: [] m_Father: {fileID: 745151882} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0.00082605326} - m_SizeDelta: {x: -0.000061035, y: 244} + m_SizeDelta: {x: -0.000061035, y: 2} m_Pivot: {x: 0, y: 1} --- !u!114 &1704085230 MonoBehaviour: @@ -17251,7 +16660,7 @@ GameObject: - component: {fileID: 1712599091} - component: {fileID: 1712599090} m_Layer: 5 - m_Name: Leader + m_Name: First m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -17388,11 +16797,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5fe33ff09d0ea4848ac88809df94dbc8, type: 3} m_Name: m_EditorClassIdentifier: + characterID: 0 character: {fileID: 1712599086} controlButton: {fileID: 471720400} levelIcon: {fileID: 619102158} charcterImg: {fileID: 1974927309} - leaderStatusIcon: {fileID: 0} skillName: {fileID: 86375881} isLeader: {fileID: 12180238} notLeader: {fileID: 1852342896} @@ -17877,126 +17286,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1772804502} m_CullTransparentMesh: 1 ---- !u!1 &1791262369 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1791262370} - - component: {fileID: 1791262372} - - component: {fileID: 1791262371} - - component: {fileID: 1791262373} - m_Layer: 5 - m_Name: leftIcon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1791262370 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1791262369} - 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: 1987368278} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.01914089, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -66.14577, y: 99.046} - m_SizeDelta: {x: -133.4546, y: -193.8428} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1791262371 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1791262369} - 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: 785cf3c544449b54b908cfaea02d4864, 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!222 &1791262372 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1791262369} - m_CullTransparentMesh: 1 ---- !u!114 &1791262373 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1791262369} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1791262371} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!1 &1800876330 GameObject: m_ObjectHideFlags: 0 @@ -18279,81 +17568,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1819021844} m_CullTransparentMesh: 1 ---- !u!1 &1841216039 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1841216040} - - component: {fileID: 1841216042} - - component: {fileID: 1841216041} - m_Layer: 5 - m_Name: image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1841216040 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1841216039} - 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: 1987368278} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 4.9328613, y: -3.8088684} - m_SizeDelta: {x: 0.7026062, y: 11.866501} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1841216041 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1841216039} - 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: 4cfddbb3f863ce7438489672608b52e7, 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!222 &1841216042 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1841216039} - m_CullTransparentMesh: 1 --- !u!1 &1852342896 GameObject: m_ObjectHideFlags: 0 @@ -19758,45 +18972,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1975772328} m_CullTransparentMesh: 1 ---- !u!1 &1987368277 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1987368278} - m_Layer: 5 - m_Name: chacterCard - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1987368278 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1987368277} - 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: - - {fileID: 1841216040} - - {fileID: 1791262370} - - {fileID: 677413414} - - {fileID: 1005912080} - m_Father: {fileID: 1704085229} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 94, y: -124} - m_SizeDelta: {x: 180, y: 240} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1987921078 GameObject: m_ObjectHideFlags: 0 @@ -21148,7 +20323,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: default Skil + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c95ab61f13e39254e8e3cbf4059d88c5, type: 2} m_sharedMaterial: {fileID: 4492750392876140565, guid: c95ab61f13e39254e8e3cbf4059d88c5, type: 2} @@ -21434,45 +20609,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2115994377} m_CullTransparentMesh: 1 ---- !u!1 &2122860486 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2122860487} - m_Layer: 5 - m_Name: chacterCard - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2122860487 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2122860486} - 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: - - {fileID: 1362212622} - - {fileID: 1077432359} - - {fileID: 36876045} - - {fileID: 942863506} - m_Father: {fileID: 1704085229} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 458, y: -124} - m_SizeDelta: {x: 180, y: 240} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2143665088 GameObject: m_ObjectHideFlags: 0 @@ -21593,8 +20729,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1593528873} - m_TargetAssemblyTypeName: teamSettingPanel, Assembly-CSharp + - m_Target: {fileID: 1593528872} + m_TargetAssemblyTypeName: TeamManager, Assembly-CSharp m_MethodName: closeTeamSettingPanel m_Mode: 1 m_Arguments: @@ -21680,111 +20816,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2145804832} m_CullTransparentMesh: 1 ---- !u!1001 &7967908447032725239 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1704085229} - m_Modifications: - - target: {fileID: 2949374534111508497, guid: 2b0df49c627c9b84fb585add14c2dfa9, type: 3} - propertyPath: m_Name - value: chacterCard - objectReference: {fileID: 0} - - target: {fileID: 4550571342346605983, guid: 2b0df49c627c9b84fb585add14c2dfa9, type: 3} - propertyPath: m_Name - value: occupationIcon - objectReference: {fileID: 0} - - target: {fileID: 4550571342346605983, guid: 2b0df49c627c9b84fb585add14c2dfa9, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6068646603734489704, guid: 2b0df49c627c9b84fb585add14c2dfa9, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6068646603734489704, guid: 2b0df49c627c9b84fb585add14c2dfa9, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6068646603734489704, guid: 2b0df49c627c9b84fb585add14c2dfa9, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6068646603734489704, guid: 2b0df49c627c9b84fb585add14c2dfa9, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6068646603734489704, guid: 2b0df49c627c9b84fb585add14c2dfa9, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6068646603734489704, guid: 2b0df49c627c9b84fb585add14c2dfa9, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6068646603734489704, guid: 2b0df49c627c9b84fb585add14c2dfa9, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6068646603734489704, guid: 2b0df49c627c9b84fb585add14c2dfa9, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6068646603734489704, guid: 2b0df49c627c9b84fb585add14c2dfa9, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6068646603734489704, guid: 2b0df49c627c9b84fb585add14c2dfa9, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6068646603734489704, guid: 2b0df49c627c9b84fb585add14c2dfa9, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6068646603734489704, guid: 2b0df49c627c9b84fb585add14c2dfa9, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6068646603734489704, guid: 2b0df49c627c9b84fb585add14c2dfa9, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6068646603734489704, guid: 2b0df49c627c9b84fb585add14c2dfa9, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6068646603734489704, guid: 2b0df49c627c9b84fb585add14c2dfa9, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6068646603734489704, guid: 2b0df49c627c9b84fb585add14c2dfa9, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6068646603734489704, guid: 2b0df49c627c9b84fb585add14c2dfa9, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6068646603734489704, guid: 2b0df49c627c9b84fb585add14c2dfa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6068646603734489704, guid: 2b0df49c627c9b84fb585add14c2dfa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6068646603734489704, guid: 2b0df49c627c9b84fb585add14c2dfa9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2b0df49c627c9b84fb585add14c2dfa9, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/selectYourSongFirst.unity b/Assets/Scenes/selectYourSongFirst.unity index 59c502b2..b40f054a 100644 --- a/Assets/Scenes/selectYourSongFirst.unity +++ b/Assets/Scenes/selectYourSongFirst.unity @@ -2318,6 +2318,10 @@ PrefabInstance: propertyPath: m_Name value: Button objectReference: {fileID: 0} + - target: {fileID: 1198053886828452625, guid: ce2cc510e6c307947a5dbf185318777e, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4974503315116154840, guid: ce2cc510e6c307947a5dbf185318777e, type: 3} propertyPath: m_Type value: 0 diff --git a/Assets/Resources/TeamCharacters/TeamCharacterImg.meta b/Assets/TeamCharacterDataBase.meta similarity index 77% rename from Assets/Resources/TeamCharacters/TeamCharacterImg.meta rename to Assets/TeamCharacterDataBase.meta index c8fcaf5d..814f33f0 100644 --- a/Assets/Resources/TeamCharacters/TeamCharacterImg.meta +++ b/Assets/TeamCharacterDataBase.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4725964d70c69894abd8b20964959113 +guid: e9cbffecea956fa4b871657753680026 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/TeamCharacterDataBase/CharacterList.asset b/Assets/TeamCharacterDataBase/CharacterList.asset new file mode 100644 index 00000000..b15e27ba --- /dev/null +++ b/Assets/TeamCharacterDataBase/CharacterList.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eaf4c7edaf0b74e49a85771b8c5b85eb, type: 3} + m_Name: CharacterList + m_EditorClassIdentifier: + characters: + - {fileID: 11400000, guid: bc37529925b6b414f801a85c12c80f6d, type: 2} + - {fileID: 11400000, guid: 8e5e7d1ca158e7c498293a6518a09163, type: 2} diff --git a/Assets/TeamCharacterDataBase/CharacterList.asset.meta b/Assets/TeamCharacterDataBase/CharacterList.asset.meta new file mode 100644 index 00000000..191f7aba --- /dev/null +++ b/Assets/TeamCharacterDataBase/CharacterList.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 74a349c5a048ac54da419a61dabd9ab6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TeamCharacterDataBase/script.meta b/Assets/TeamCharacterDataBase/script.meta new file mode 100644 index 00000000..e671e8c8 --- /dev/null +++ b/Assets/TeamCharacterDataBase/script.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7f082104af4ec4746b41b380d085972c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TeamCharacterDataBase/script/TeamCharacterDataInfo.cs b/Assets/TeamCharacterDataBase/script/TeamCharacterDataInfo.cs new file mode 100644 index 00000000..417e8889 --- /dev/null +++ b/Assets/TeamCharacterDataBase/script/TeamCharacterDataInfo.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +/// +/// 该sobj仅适用于编队系统，角色系统的详细信息需要另外设计 +/// +[CreateAssetMenu(fileName = "CharacterDataInfo", menuName = "TeamCharacter/TeamCharacterDataInfo")] +public class TeamCharacterDataInfo :ScriptableObject +{ + /// + /// 角色系统请以此id为准来查找数据 + /// + public int CharacterID; + public string CharacterSkillName; + public Sprite CharacterCardSprite; + public Sprite CharacterTeamSprite; + public Sprite CharacterRoleSprite; +} diff --git a/Assets/TeamCharacterDataBase/script/TeamCharacterDataInfo.cs.meta b/Assets/TeamCharacterDataBase/script/TeamCharacterDataInfo.cs.meta new file mode 100644 index 00000000..0b6488b1 --- /dev/null +++ b/Assets/TeamCharacterDataBase/script/TeamCharacterDataInfo.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5976726b6b1585d4bae159d4a817b84e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TeamCharacterDataBase/script/TeamCharacterLevelData.cs b/Assets/TeamCharacterDataBase/script/TeamCharacterLevelData.cs new file mode 100644 index 00000000..8769036d --- /dev/null +++ b/Assets/TeamCharacterDataBase/script/TeamCharacterLevelData.cs @@ -0,0 +1,11 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +[CreateAssetMenu(fileName = "CharacterLevelData", menuName = "Character/CharacterLevelData")] +public class TeamCharacterLevelData : ScriptableObject +{ + public Sprite LevelCSprite; + public Sprite LevelSSprite; + public Sprite LevelASprite; + public Sprite LevelBSprite; +} diff --git a/Assets/TeamCharacterDataBase/script/TeamCharacterLevelData.cs.meta b/Assets/TeamCharacterDataBase/script/TeamCharacterLevelData.cs.meta new file mode 100644 index 00000000..6a7ac81e --- /dev/null +++ b/Assets/TeamCharacterDataBase/script/TeamCharacterLevelData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b6283ed431b50f749a644d480b0bc324 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TeamCharacterDataBase/script/TeamCharacterList.cs b/Assets/TeamCharacterDataBase/script/TeamCharacterList.cs new file mode 100644 index 00000000..1bb74ea7 --- /dev/null +++ b/Assets/TeamCharacterDataBase/script/TeamCharacterList.cs @@ -0,0 +1,8 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +[CreateAssetMenu(fileName = "CharacterList", menuName = "TeamCharacter/TeamCharacterList")] +public class TeamCharacterList : ScriptableObject +{ + public List characters=new List(); +} diff --git a/Assets/TeamCharacterDataBase/script/TeamCharacterList.cs.meta b/Assets/TeamCharacterDataBase/script/TeamCharacterList.cs.meta new file mode 100644 index 00000000..0b2747bf --- /dev/null +++ b/Assets/TeamCharacterDataBase/script/TeamCharacterList.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: eaf4c7edaf0b74e49a85771b8c5b85eb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/artworks/Songs_Select/team_SettingResource/prefab/chacterCard.prefab b/Assets/artworks/Songs_Select/team_SettingResource/prefab/chacterCard.prefab index 3fd31b4a..83a4bd6f 100644 --- a/Assets/artworks/Songs_Select/team_SettingResource/prefab/chacterCard.prefab +++ b/Assets/artworks/Songs_Select/team_SettingResource/prefab/chacterCard.prefab @@ -65,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 84ef05cda680d7a40a5108f0a5bcc1c9, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -86,7 +86,6 @@ GameObject: - component: {fileID: 3228097016014596376} - component: {fileID: 4065988666777179856} - component: {fileID: 2921092759260112579} - - component: {fileID: 2111168341660587780} m_Layer: 5 m_Name: levelIcon m_TagString: Untagged @@ -141,7 +140,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: cc6dc195a4e12f74e93a76d0a812c100, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -151,50 +150,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &2111168341660587780 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 227430959558785920} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 2921092759260112579} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!1 &2949374534111508497 GameObject: m_ObjectHideFlags: 0 @@ -247,11 +202,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 31ac798fff192ba4b92574fbc38f7d35, type: 3} m_Name: m_EditorClassIdentifier: + characterID: 0 charactCard: {fileID: 2949374534111508497} characterImage: {fileID: 1068789348870044308} levelIcon: {fileID: 2921092759260112579} occupationIcon: {fileID: 3273503338186152757} - characterName: --- !u!1 &3298850994316689979 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/scripts/Team/Character.cs b/Assets/scripts/Team/Character.cs deleted file mode 100644 index d6e7fb08..00000000 --- a/Assets/scripts/Team/Character.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Character -{ - /// - /// 角色名称 - /// - public string name{get; set;} - /// - /// 职业 - /// - public string occupation{get; set;} - /// - /// 突破等级 - /// - public string boundaryLevel{get; set;} - /// - /// 技能名称 - /// - public string SkillName{get; set;} - /// - /// 是否为队长 - /// - public bool isLeader{get; set;} - - public Character(string name, string occupation, string boundaryLevel, string skillName) - { - this.name = name; - this.occupation = occupation; - this.boundaryLevel = boundaryLevel; - this.SkillName = skillName; - } -} diff --git a/Assets/scripts/Team/CharacterCardView.cs b/Assets/scripts/Team/CharacterCardView.cs index 60af0a2f..3d08aff2 100644 --- a/Assets/scripts/Team/CharacterCardView.cs +++ b/Assets/scripts/Team/CharacterCardView.cs @@ -5,11 +5,11 @@ using UnityEngine.UI; public class CharacterCardView : MonoBehaviour { + public int characterID; public GameObject charactCard; public Image characterImage; public Image levelIcon; public Image occupationIcon; - public string characterName; void Start() { @@ -17,11 +17,6 @@ public class CharacterCardView : MonoBehaviour characterImage.sprite = null; levelIcon.sprite = null; } - /// - /// 根据角色名称获取角色介绍信息 - /// - void checkCharacterInformation() - { - Debug.Log("尝试获取角色介绍:"+characterName); - } + + } diff --git a/Assets/scripts/Team/TeamManager.cs b/Assets/scripts/Team/TeamManager.cs index f6395cf0..264cd76b 100644 --- a/Assets/scripts/Team/TeamManager.cs +++ b/Assets/scripts/Team/TeamManager.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using Unity.Collections; using UnityEngine; public class TeamManager : MonoBehaviour @@ -9,13 +10,13 @@ public class TeamManager : MonoBehaviour public teamSettingPanel teamSettingPanelInstance; /// - /// 当前玩家存档下的所有编队配置 + /// 当前玩家存档下的所有编队配置,key为编队索引，value为该编队的角色列表，表内只有角色ID /// - public Dictionary> currentTeamSettings = new Dictionary>(); + public Dictionary currentTeamSettings = new Dictionary(); /// /// 玩家存档下已经解锁的角色信息列表 /// - public List SelectableCharacterList = new List(); + public List SelectableCharacterList = new List(); /// /// 根据此字段来在编队信息页显示已有编队 /// @@ -43,40 +44,44 @@ public class TeamManager : MonoBehaviour void testTeamSetting() { - SelectableCharacterList.Add(new Character("YUETAO","default","C","pure dissidents")); - SelectableCharacterList.Add(new Character("AYANO","default","B","default skillName")); - SelectableCharacterList.Add(new Character("YUETAO","default","C","pure dissidents")); - SelectableCharacterList.Add(new Character("AYANO","default","S","default skillName")); + SelectableCharacterList.Add(new CharacterView(1001001,"C")); + SelectableCharacterList.Add(new CharacterView(1001002,"S")); + SelectableCharacterList.Add(new CharacterView(1001001,"C")); + SelectableCharacterList.Add(new CharacterView(1001002,"C")); //手动向currentTeamSettings和SelectableCharacterList添加测试数据 - currentTeamSettings.Add(0,new List()); - currentTeamSettings[0].Add(new Character("YUETAO","default","C","pure dissidents")); - currentTeamSettings[0].Add(new Character("AYANO","default","B","default skillName")); - currentTeamSettings[0].Add(new Character("YUETAO","default","C","pure dissidents")); - currentTeamSettings[0].Add(new Character("YUETAO","default","C","pure dissidents")); + currentTeamSettings.Add(0,new TeamSetting(new List(),1001001)); + currentTeamSettings[0].teamIdList.Add(new CharacterView(1001001,"C")); + currentTeamSettings[0].teamIdList.Add(new CharacterView(1001002,"S")); + currentTeamSettings[0].teamIdList.Add(new CharacterView(1001001,"C")); + currentTeamSettings[0].teamIdList.Add( new CharacterView(1001002,"C")); + + currentTeamSettings.Add(1,new TeamSetting(new List(),1001002)); + currentTeamSettings[0].teamIdList.Add(new CharacterView(1001001,"C")); + currentTeamSettings[0].teamIdList.Add(new CharacterView(1001002,"B")); + currentTeamSettings[0].teamIdList.Add(new CharacterView(1001001,"C")); + currentTeamSettings[0].teamIdList.Add( new CharacterView(1001002,"A")); + currentTeamSettings[0].teamIdList.Add(new CharacterView(1001002,"A")); - currentTeamSettings.Add(1,new List()); - currentTeamSettings[1].Add(new Character("YUETAO","default","C","pure dissidents")); - currentTeamSettings[1].Add(new Character("AYANO","default","B","default skillName")); - currentTeamSettings[1].Add(new Character("YUETAO","default","C","pure dissidents")); - currentTeamSettings[1].Add(new Character("YUETAO","default","C","pure dissidents")); Debug.Log("testTeamSetting ready"); } - + public void openTeamSettingPanel()=> teamSettingPanelInstance.gameObject.SetActive(true); + public void closeTeamSettingPanel()=> teamSettingPanelInstance.gameObject.SetActive(false); + void Start() { - if(teamSettingPanelInstance == null) - { - teamSettingPanelInstance = teamSettingPanel.Instance; - } + // if(teamSettingPanelInstance == null) + // { + // teamSettingPanelInstance = teamSettingPanel.Instance; + // } testTeamSetting();//接入玩家存档后请注释掉此行 } /// /// 读取玩家存档信息后可直接在此写入编队信息 /// /// - public void setcurrentTeamSettings(Dictionary> playerTeamSettings) + public void setcurrentTeamSettings(Dictionary playerTeamSettings) { currentTeamSettings = playerTeamSettings; } @@ -84,12 +89,12 @@ public class TeamManager : MonoBehaviour /// 依据选定的队伍预设索引来获得队伍信息 /// /// - public List getCurrentSelectedTeam() + public TeamSetting getCurrentSelectedTeam() { return currentTeamSettings[currentSelectedTeam]; } - public void setCurrentSelectedTeam(List newTeamData, int teamIndex) + public void setCurrentSelectedTeam(TeamSetting newTeamData, int teamIndex) { currentTeamSettings[teamIndex] = newTeamData; } @@ -108,11 +113,11 @@ public class TeamManager : MonoBehaviour /// public void swapTeamElements(int firstIndex, int secondIndex) { - List newCurrentTeam = getCurrentSelectedTeam(); - Character temp = newCurrentTeam[firstIndex]; + List newCurrentTeam = getCurrentSelectedTeam().teamIdList; + CharacterView temp = newCurrentTeam[firstIndex]; newCurrentTeam[firstIndex] = newCurrentTeam[secondIndex]; newCurrentTeam[secondIndex] = temp; - currentTeamSettings[currentSelectedTeam] = newCurrentTeam; + currentTeamSettings[currentSelectedTeam].teamIdList = newCurrentTeam; } diff --git a/Assets/scripts/Team/TeamSetting.cs b/Assets/scripts/Team/TeamSetting.cs new file mode 100644 index 00000000..ef2c2d2a --- /dev/null +++ b/Assets/scripts/Team/TeamSetting.cs @@ -0,0 +1,35 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +/// +/// 适用于编队系统数据层,存储单个队伍的信息 +/// +public class TeamSetting +{ + public TeamSetting(List teamList, int leaderId) + { + this.teamIdList = teamIdList; + LeaderId = leaderId; + } + + + public List teamIdList = new List(); + + /// + /// 队长 + /// + public int LeaderId{get; set;} + +} + +public class CharacterView +{ + public CharacterView(int characterId, string currentBoundaryLevel) + { + this.characterId = characterId; + this.currentBoundaryLevel = currentBoundaryLevel; + } + + public int characterId{get; set;} + public string currentBoundaryLevel{get; set;} +} diff --git a/Assets/scripts/Team/Character.cs.meta b/Assets/scripts/Team/TeamSetting.cs.meta similarity index 100% rename from Assets/scripts/Team/Character.cs.meta rename to Assets/scripts/Team/TeamSetting.cs.meta diff --git a/Assets/scripts/Team/teamCharacterView.cs b/Assets/scripts/Team/teamCharacterView.cs index 08b62f82..6a7d1e0e 100644 --- a/Assets/scripts/Team/teamCharacterView.cs +++ b/Assets/scripts/Team/teamCharacterView.cs @@ -8,6 +8,7 @@ using UnityEngine.UI; //适用于编队 列表 public class teamCharacterView : MonoBehaviour { + public int characterID; public GameObject character; public GameObject controlButton; public Image levelIcon; @@ -24,7 +25,9 @@ public class teamCharacterView : MonoBehaviour { character = gameObject; levelIcon.sprite=null; + levelIcon.color = new Color(levelIcon.color.r, levelIcon.color.g, levelIcon.color.b, 0); charcterImg.sprite=null; + charcterImg.color = new Color(charcterImg.color.r, charcterImg.color.g, charcterImg.color.b, 0); controlButton.SetActive(isSelected); } /// diff --git a/Assets/scripts/Team/teamSettingPanel.cs b/Assets/scripts/Team/teamSettingPanel.cs index 6b622965..98a14823 100644 --- a/Assets/scripts/Team/teamSettingPanel.cs +++ b/Assets/scripts/Team/teamSettingPanel.cs @@ -1,7 +1,9 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.UI; using utils; +using Transform = UnityEngine.Transform; public class teamSettingPanel : MonoBehaviour { @@ -16,6 +18,16 @@ public class teamSettingPanel : MonoBehaviour [SerializeField] public GameObject[] teamElementsObj; /// + /// team用角色数据库总表 + /// + [SerializeField] + public TeamCharacterList teamCharacterList; + /// + /// 等级贴图表 + /// + [SerializeField] + public TeamCharacterLevelData teamCharacterLevelData; + /// /// 左侧角色选择页组件 /// [SerializeField] @@ -47,6 +59,9 @@ public class teamSettingPanel : MonoBehaviour { teamManager.OnSelectedCharacterChanged += updateTeamCharacterSelectedStatus; } + StartCoroutine(UpdateTeamSettingAfterOneFrame()); + // updateTeamSettingElements(); + StartCoroutine(UpdateSelectableCharacterAfterOneFrame()); } void OnDestroy() { @@ -57,27 +72,102 @@ public class teamSettingPanel : MonoBehaviour } public void openTeamSettingPanel() { - updateTeamSettingElements(); - getSelectableCharacterList(); //根据获取的队伍信息处理ui组件 //可在此补充ui动画信息 + StartCoroutine(UpdateTeamSettingAfterOneFrame()); + // updateTeamSettingElements(); + StartCoroutine(UpdateSelectableCharacterAfterOneFrame()); teamSettingPanelObj.SetActive(true); + // getSelectableCharacterList(); + } + private IEnumerator UpdateTeamSettingAfterOneFrame() + { + yield return null; + + updateTeamSettingElements(); + foreach (var obj in teamElementsObj) + { + if (obj != null) + { + var t = obj.GetComponent(); + if (t != null && t.charcterImg != null) + { + LayoutRebuilder.ForceRebuildLayoutImmediate(t.charcterImg.rectTransform); + } + } + } + } + private IEnumerator UpdateSelectableCharacterAfterOneFrame() + { + yield return null; + + updateSelectableCharacterViewList(); + //获取content下的所有子对象，并重新布局 + // foreach (Transform child in teamCharacterViewContent.transform) + // { + // if (child != null) + // { + // var t = child.GetComponent(); + // if (t != null && t.characterImage != null) + // { + // LayoutRebuilder.ForceRebuildLayoutImmediate(t.characterImage.rectTransform); + // } + // } + // } + RectTransform rt = teamCharacterViewContent.GetComponent(); + LayoutRebuilder.ForceRebuildLayoutImmediate(rt); } public void closeTeamSettingPanel() { teamSettingPanelObj.SetActive(false); - Transform transform; - for (int i = 0; i < teamCharacterViewContent.transform.childCount; i++) + } + public TeamCharacterDataInfo getCharacterViewInfo(int characterID) + { + if (teamCharacterList == null) { - transform = teamCharacterViewContent.transform.GetChild(i); - GameObject.Destroy(transform.gameObject); + Debug.LogError("teamCharacterList 缺失"); + return null; + } + foreach (TeamCharacterDataInfo tcdi in teamCharacterList.characters) + { + if(tcdi.CharacterID==characterID) + { + return tcdi; + } + } + Debug.LogWarning($"未找到{characterID}对应的角色信息");; + return null; + } + + public Sprite getLevelSprite(string level) + { + if(level==null) + { + Debug.LogWarning("level为空，无法获取对应等级贴图"); + return null; + } + + switch (level) + { + case "S": + return teamCharacterLevelData.LevelSSprite; + case "A": + return teamCharacterLevelData.LevelASprite; + case "B": + return teamCharacterLevelData.LevelBSprite; + case "C": + return teamCharacterLevelData.LevelCSprite; + default: + Debug.LogWarning($"未找到对应等级贴图，当前等级为：{level}"); + return null; } } public void updateTeamSettingElements() { - List currentTeam = teamManager.getCurrentSelectedTeam(); + TeamSetting currentSelectedTeam = teamManager.getCurrentSelectedTeam(); + List currentTeam = currentSelectedTeam.teamIdList; for (int i = 0; i < teamElementsObj.Length && i < currentTeam.Count; i++) { if(teamElementsObj[i]!=null && currentTeam[i]!=null) @@ -85,13 +175,20 @@ public class teamSettingPanel : MonoBehaviour teamCharacterView t = teamElementsObj[i].GetComponent(); if(t!=null) { - Sprite sprite; - sprite = FileUtils.getImage($"TeamCharacters/TeamCharacterImg/{currentTeam[i].name}"); - t.charcterImg.sprite = sprite; - sprite = FileUtils.getImage($"TeamCharacters/levelIcon/level{currentTeam[i].boundaryLevel}"); - t.levelIcon.sprite = sprite; - t.isLeader.SetActive(currentTeam[i].isLeader); - t.notLeader.SetActive(!currentTeam[i].isLeader); + t.characterID= currentTeam[i].characterId; + TeamCharacterDataInfo tcdi = getCharacterViewInfo(t.characterID); + + t.charcterImg.sprite = tcdi.CharacterTeamSprite; + t.charcterImg.color=new Color(t.charcterImg.color.r,t.charcterImg.color.g,t.charcterImg.color.b,255f); + + t.levelIcon.sprite = getLevelSprite(currentTeam[i].currentBoundaryLevel); + t.levelIcon.color=new Color(t.levelIcon.color.r,t.levelIcon.color.g,t.levelIcon.color.b,255f); + if(currentSelectedTeam.LeaderId==currentTeam[i].characterId) + { + t.isLeader.SetActive(true); + t.notLeader.SetActive(false); + } + t.skillName.text = tcdi.CharacterSkillName; } } } @@ -99,19 +196,25 @@ public class teamSettingPanel : MonoBehaviour /// /// 获取当前可选入队伍的角色列表，并显示在界面上 /// - public void getSelectableCharacterList() + public void updateSelectableCharacterViewList() { - List selectAbleCharacters = teamManager.SelectableCharacterList; - foreach (Character c in selectAbleCharacters) + foreach (Transform child in teamCharacterViewContent.transform) + { + Destroy(child.gameObject); + } + List selectAbleCharacters = teamManager.SelectableCharacterList; + foreach (CharacterView c in selectAbleCharacters) //id and level { GameObject characterObj = Instantiate(teamCharacterPrefab, teamCharacterViewContent.transform); CharacterCardView ccv = characterObj.GetComponent(); - if (ccv != null) + TeamCharacterDataInfo tcdi = getCharacterViewInfo(c.characterId); + if (ccv != null&& tcdi!=null) { - ccv.characterName = c.name; - ccv.characterImage.sprite = FileUtils.getImage($"TeamCharacters/CharacterImg/{c.name}"); - ccv.levelIcon.sprite = FileUtils.getImage($"TeamCharacters/levelIcon/level{c.boundaryLevel}"); - ccv.occupationIcon.sprite = FileUtils.getImage($"TeamCharacters/OccupationIcon/{c.occupation}"); + ccv.characterID = tcdi.CharacterID; + ccv.characterImage.sprite =tcdi.CharacterCardSprite; + ccv.levelIcon.sprite = getLevelSprite(c.currentBoundaryLevel); + ccv.occupationIcon.sprite = tcdi.CharacterRoleSprite; + Debug.Log($"{ccv.characterID}--{ccv.characterImage.sprite.name}--{ccv.levelIcon.sprite.name}--{ccv.gameObject.name}"); } } } diff --git a/Assets/songsDatabase/SongDataController/SongButton.cs b/Assets/songsDatabase/SongDataController/SongButton.cs index 58da522b..5e21a092 100644 --- a/Assets/songsDatabase/SongDataController/SongButton.cs +++ b/Assets/songsDatabase/SongDataController/SongButton.cs @@ -5,14 +5,14 @@ using UnityEngine.SceneManagement; public class SongButton : MonoBehaviour { - public TextMeshProUGUI songNameText; // ı - public TextMeshProUGUI highestScoreText; // ߷ı - public TextMeshProUGUI difficultyIDText; // ѶIDı + public TextMeshProUGUI songNameText; // 歌曲名称文本 + public TextMeshProUGUI highestScoreText; // 个人最高分文本 + public TextMeshProUGUI difficultyIDText; // 难度ID文本 public TextMeshProUGUI songIDText; - public Image buttonImage; // ť Image ñͼ - public int song_songSerialID; // ťӦĸID + public Image buttonImage; // 按钮的 Image 组件，用于设置背景图像 + public int song_songSerialID; // 按钮对应的歌曲ID - // ðť + // 设置按钮的数据 public void Start() { @@ -20,7 +20,7 @@ public class SongButton : MonoBehaviour } public void SetButtonData(string songName, int highestScore, int difficultyID, Sprite songSprite, int songID) { - Debug.Log("SetButtonData , songID : " + songID); + Debug.Log("SetButtonData 被调用, songID 参数: " + songID); songNameText.text = songName; highestScoreText.text = "PR: " + highestScore.ToString(); difficultyIDText.text = "" + difficultyID.ToString(); @@ -30,10 +30,10 @@ public class SongButton : MonoBehaviour } - // ť¼ song_songSerialID ҶӦ SongDataݵ¸ + // 按钮点击事件：根据 song_songSerialID 查找对应的 SongData，并传递到下个场景 public void OnSongButtonClick() { - Debug.Log("ť song_songSerialID: " + song_songSerialID); + Debug.Log("点击按钮的 song_songSerialID: " + song_songSerialID); SongData selectedSong = SongDataLibrary.Instance.GetSongDataByID(song_songSerialID); if (selectedSong != null) { @@ -42,7 +42,7 @@ public class SongButton : MonoBehaviour } else { - Debug.LogError("δҵӦ SongData, songID: " + song_songSerialID); + Debug.LogError("未找到对应的 SongData, songID: " + song_songSerialID); } }