diff --git a/Assets/ManagedResources/Atlas/LoginAtlas/agetip.png b/Assets/ManagedResources/Atlas/LoginAtlas/agetip.png new file mode 100644 index 0000000000..cc7cbd37e2 Binary files /dev/null and b/Assets/ManagedResources/Atlas/LoginAtlas/agetip.png differ diff --git a/Assets/ManagedResources/Atlas/LoginAtlas/agetip.png.meta b/Assets/ManagedResources/Atlas/LoginAtlas/agetip.png.meta new file mode 100644 index 0000000000..2638b24e39 --- /dev/null +++ b/Assets/ManagedResources/Atlas/LoginAtlas/agetip.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: c8e01809dce7f844b811b31225d53b49 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: ae0ca56945098f2489b247192ff429ef + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: LoginAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/Live2d/live2d_c_0038_02.prefab b/Assets/ManagedResources/Prefabs/Live2d/live2d_c_0038_02.prefab new file mode 100644 index 0000000000..e8a01aa295 --- /dev/null +++ b/Assets/ManagedResources/Prefabs/Live2d/live2d_c_0038_02.prefab @@ -0,0 +1,85 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5128338094171190710 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1331624869961921354} + - component: {fileID: 1132079717097779204} + - component: {fileID: 8554652772969888609} + m_Layer: 0 + m_Name: live2d_c_0038_02 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1331624869961921354 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5128338094171190710} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1132079717097779204 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5128338094171190710} + m_CullTransparentMesh: 0 +--- !u!114 &8554652772969888609 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5128338094171190710} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + skeletonDataAsset: {fileID: 11400000, guid: c1e145f8fdef1c94ea283be131e1b05b, type: 2} + initialSkinName: default + initialFlipX: 0 + initialFlipY: 0 + startingAnimation: + startingLoop: 1 + timeScale: 1 + freeze: 0 + unscaledTime: 0 + meshGenerator: + settings: + useClipping: 1 + zSpacing: 0 + pmaVertexColors: 1 + tintBlack: 0 + calculateTangents: 0 + addNormals: 0 + immutableTriangles: 0 diff --git a/Assets/ManagedResources/Prefabs/Live2d/live2d_c_0038_02.prefab.meta b/Assets/ManagedResources/Prefabs/Live2d/live2d_c_0038_02.prefab.meta new file mode 100644 index 0000000000..016c7f3405 --- /dev/null +++ b/Assets/ManagedResources/Prefabs/Live2d/live2d_c_0038_02.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 546182dc81e79f746bd7df32eecdc614 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: lz4/prefabs/live2d/live2d_c_0038 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Prefabs/Live2d/live2d_c_0043_02.prefab b/Assets/ManagedResources/Prefabs/Live2d/live2d_c_0043_02.prefab new file mode 100644 index 0000000000..89bcad4e37 --- /dev/null +++ b/Assets/ManagedResources/Prefabs/Live2d/live2d_c_0043_02.prefab @@ -0,0 +1,85 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1673840058680179958 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6570451205385711518} + - component: {fileID: 9047955029862091937} + - component: {fileID: 8562833744085429047} + m_Layer: 0 + m_Name: live2d_c_0043_02 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6570451205385711518 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1673840058680179958} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9047955029862091937 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1673840058680179958} + m_CullTransparentMesh: 0 +--- !u!114 &8562833744085429047 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1673840058680179958} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + skeletonDataAsset: {fileID: 11400000, guid: 50740b2703cf16348bf1b361abc70d14, type: 2} + initialSkinName: default + initialFlipX: 0 + initialFlipY: 0 + startingAnimation: + startingLoop: 1 + timeScale: 1 + freeze: 0 + unscaledTime: 0 + meshGenerator: + settings: + useClipping: 1 + zSpacing: 0 + pmaVertexColors: 1 + tintBlack: 0 + calculateTangents: 0 + addNormals: 0 + immutableTriangles: 0 diff --git a/Assets/ManagedResources/Prefabs/Live2d/live2d_c_0043_02.prefab.meta b/Assets/ManagedResources/Prefabs/Live2d/live2d_c_0043_02.prefab.meta new file mode 100644 index 0000000000..9220fd6652 --- /dev/null +++ b/Assets/ManagedResources/Prefabs/Live2d/live2d_c_0043_02.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9b22dcf1c2f705846bce84f9c20ccfc5 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: lz4/prefabs/live2d/live2d_c_0043 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab index c3b451d909..ce852134c7 100644 --- a/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab @@ -31,7 +31,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8490762427581985335} - m_RootOrder: 15 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -218,7 +218,7 @@ RectTransform: m_Children: - {fileID: 2019625878} m_Father: {fileID: 8490762427581985335} - m_RootOrder: 16 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -599,7 +599,7 @@ RectTransform: m_Children: - {fileID: 3617233529308977401} m_Father: {fileID: 8490762427581985335} - m_RootOrder: 13 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -706,7 +706,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8490762427581985335} - m_RootOrder: 14 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1303,7 +1303,7 @@ RectTransform: - {fileID: 1498997702403170812} - {fileID: 5682579529262169544} m_Father: {fileID: 8490762427581985335} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1347,6 +1347,80 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 +--- !u!1 &4533360945069900212 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3694468704094853678} + - component: {fileID: 2745943346499871098} + - component: {fileID: 6176814092861021507} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3694468704094853678 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4533360945069900212} + 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_Children: [] + m_Father: {fileID: 1151968144639047202} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 88, y: 112} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2745943346499871098 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4533360945069900212} + m_CullTransparentMesh: 0 +--- !u!114 &6176814092861021507 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4533360945069900212} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: c8e01809dce7f844b811b31225d53b49, 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 --- !u!1 &4988553398133080000 GameObject: m_ObjectHideFlags: 0 @@ -2691,6 +2765,144 @@ MonoBehaviour: y: 0 width: 1 height: 1 +--- !u!1 &8330344460664436701 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1151968144639047202} + - component: {fileID: 4383685619027396480} + - component: {fileID: 3093173268509289578} + - component: {fileID: 1813495788557578669} + - component: {fileID: 8489073618658776085} + m_Layer: 5 + m_Name: btnAgeTip + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1151968144639047202 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8330344460664436701} + 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_Children: + - {fileID: 3694468704094853678} + m_Father: {fileID: 8490762427581985335} + m_RootOrder: 12 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -90.39984, y: -415} + m_SizeDelta: {x: 88, y: 112} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4383685619027396480 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8330344460664436701} + m_CullTransparentMesh: 0 +--- !u!114 &3093173268509289578 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8330344460664436701} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &1813495788557578669 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8330344460664436701} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 3 + 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_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_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 3093173268509289578} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!95 &8489073618658776085 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8330344460664436701} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &8490762427106227106 GameObject: m_ObjectHideFlags: 0 @@ -12535,6 +12747,7 @@ RectTransform: - {fileID: 4076788061558919592} - {fileID: 1257937253171100053} - {fileID: 1498768961500935302} + - {fileID: 1151968144639047202} - {fileID: 1415383307548408226} - {fileID: 9012206348663900894} - {fileID: 6453992086623595374} diff --git a/Assets/ManagedResources/Spine/c_0038_02.meta b/Assets/ManagedResources/Spine/c_0038_02.meta new file mode 100644 index 0000000000..8e53cfabb4 --- /dev/null +++ b/Assets/ManagedResources/Spine/c_0038_02.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ea072c0b8044c4e44bc2fba5fac43afd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Spine/c_0038_02/c_0038_02.atlas.txt b/Assets/ManagedResources/Spine/c_0038_02/c_0038_02.atlas.txt new file mode 100644 index 0000000000..06488db0fc --- /dev/null +++ b/Assets/ManagedResources/Spine/c_0038_02/c_0038_02.atlas.txt @@ -0,0 +1,657 @@ + +c_0038_02.png +size: 756,756 +format: RGBA8888 +filter: Linear,Linear +repeat: none +bangdai_58 + rotate: false + xy: 720, 394 + size: 34, 38 + orig: 34, 38 + offset: 0, 0 + index: -1 +bangdai_59 + rotate: false + xy: 665, 234 + size: 41, 35 + orig: 41, 35 + offset: 0, 0 + index: -1 +biyan_11 + rotate: false + xy: 503, 410 + size: 9, 6 + orig: 9, 6 + offset: 0, 0 + index: -1 +biyan_25 + rotate: false + xy: 615, 234 + size: 9, 5 + orig: 9, 5 + offset: 0, 0 + index: -1 +bozi_79 + rotate: false + xy: 738, 211 + size: 16, 35 + orig: 16, 35 + offset: 0, 0 + index: -1 +daoju_80 + rotate: false + xy: 345, 32 + size: 85, 54 + orig: 85, 54 + offset: 0, 0 + index: -1 +daoju_81 + rotate: false + xy: 300, 316 + size: 201, 95 + orig: 201, 95 + offset: 0, 0 + index: -1 +daoju_86 + rotate: false + xy: 708, 232 + size: 28, 36 + orig: 28, 36 + offset: 0, 0 + index: -1 +daojuguajian_82 + rotate: false + xy: 569, 239 + size: 44, 103 + orig: 44, 103 + offset: 0, 0 + index: -1 +daojusui_84 + rotate: false + xy: 615, 94 + size: 26, 39 + orig: 26, 39 + offset: 0, 0 + index: -1 +daojusuizi_83 + rotate: false + xy: 608, 192 + size: 12, 40 + orig: 12, 40 + offset: 0, 0 + index: -1 +daojusuizi_85 + rotate: false + xy: 645, 202 + size: 32, 30 + orig: 32, 30 + offset: 0, 0 + index: -1 +guajian_5 + rotate: false + xy: 550, 192 + size: 56, 45 + orig: 56, 45 + offset: 0, 0 + index: -1 +guajian_9 + rotate: false + xy: 504, 131 + size: 48, 50 + orig: 48, 50 + offset: 0, 0 + index: -1 +guajiansuizi_56 + rotate: false + xy: 588, 40 + size: 20, 45 + orig: 20, 45 + offset: 0, 0 + index: -1 +guajiansuizi_57 + rotate: false + xy: 643, 109 + size: 11, 29 + orig: 11, 29 + offset: 0, 0 + index: -1 +houbai_72 + rotate: false + xy: 2, 270 + size: 296, 141 + orig: 296, 141 + offset: 0, 0 + index: -1 +houbai_75 + rotate: false + xy: 2, 15 + size: 133, 253 + orig: 133, 253 + offset: 0, 0 + index: -1 +houzhuangshi_97 + rotate: false + xy: 585, 599 + size: 157, 155 + orig: 157, 155 + offset: 0, 0 + index: -1 +hulu_34 + rotate: false + xy: 517, 8 + size: 42, 37 + orig: 42, 37 + offset: 0, 0 + index: -1 +huluhua_33 + rotate: false + xy: 569, 353 + size: 13, 17 + orig: 13, 17 + offset: 0, 0 + index: -1 +jiao_93 + rotate: false + xy: 724, 533 + size: 22, 64 + orig: 22, 64 + offset: 0, 0 + index: -1 +jiao_94 + rotate: false + xy: 738, 248 + size: 16, 46 + orig: 16, 46 + offset: 0, 0 + index: -1 +lian_27 + rotate: false + xy: 720, 434 + size: 34, 41 + orig: 34, 41 + offset: 0, 0 + index: -1 +meimao_24 + rotate: false + xy: 724, 527 + size: 10, 4 + orig: 10, 4 + offset: 0, 0 + index: -1 +meinao_10 + rotate: false + xy: 561, 10 + size: 8, 5 + orig: 8, 5 + offset: 0, 0 + index: -1 +piaodai_37 + rotate: false + xy: 554, 136 + size: 35, 54 + orig: 35, 54 + offset: 0, 0 + index: -1 +piaodai_38 + rotate: false + xy: 537, 410 + size: 45, 117 + orig: 45, 117 + offset: 0, 0 + index: -1 +piaodai_47 + rotate: false + xy: 218, 12 + size: 70, 82 + orig: 70, 82 + offset: 0, 0 + index: -1 +piaodai_48 + rotate: false + xy: 641, 355 + size: 71, 40 + orig: 71, 40 + offset: 0, 0 + index: -1 +piaodai_61 + rotate: false + xy: 416, 416 + size: 53, 338 + orig: 53, 338 + offset: 0, 0 + index: -1 +piaodai_62 + rotate: false + xy: 697, 397 + size: 21, 128 + orig: 21, 128 + offset: 0, 0 + index: -1 +piaodai_71 + rotate: false + xy: 584, 344 + size: 55, 181 + orig: 55, 181 + offset: 0, 0 + index: -1 +piaodai_91 + rotate: false + xy: 504, 85 + size: 51, 44 + orig: 51, 44 + offset: 0, 0 + index: -1 +piaodai_92 + rotate: false + xy: 435, 157 + size: 60, 79 + orig: 60, 79 + offset: 0, 0 + index: -1 +piaodai_95 + rotate: false + xy: 492, 251 + size: 18, 63 + orig: 18, 63 + offset: 0, 0 + index: -1 +piaodaihou_49 + rotate: false + xy: 569, 344 + size: 9, 7 + orig: 9, 7 + offset: 0, 0 + index: -1 +qunbai_68 + rotate: false + xy: 585, 527 + size: 137, 70 + orig: 137, 70 + offset: 0, 0 + index: -1 +qunzi_69 + rotate: false + xy: 471, 529 + size: 112, 225 + orig: 112, 225 + offset: 0, 0 + index: -1 +shangshen_78 + rotate: false + xy: 503, 320 + size: 64, 88 + orig: 64, 88 + offset: 0, 0 + index: -1 +shangshen_78-01 + rotate: false + xy: 471, 439 + size: 64, 88 + orig: 64, 88 + offset: 0, 0 + index: -1 +shou_40 + rotate: false + xy: 633, 157 + size: 31, 33 + orig: 31, 33 + offset: 0, 0 + index: -1 +shou_52 + rotate: false + xy: 666, 170 + size: 32, 30 + orig: 32, 30 + offset: 0, 0 + index: -1 +shoubi_41 + rotate: false + xy: 561, 38 + size: 25, 50 + orig: 25, 50 + offset: 0, 0 + index: -1 +shoubi_43 + rotate: false + xy: 476, 4 + size: 39, 40 + orig: 39, 40 + offset: 0, 0 + index: -1 +shoubi_53 + rotate: false + xy: 557, 90 + size: 29, 44 + orig: 29, 44 + offset: 0, 0 + index: -1 +shoubi_88 + rotate: false + xy: 679, 202 + size: 27, 30 + orig: 27, 30 + offset: 0, 0 + index: -1 +suiiz_30 + rotate: false + xy: 2, 2 + size: 16, 11 + orig: 16, 11 + offset: 0, 0 + index: -1 +suizi_2 + rotate: false + xy: 569, 372 + size: 13, 36 + orig: 13, 36 + offset: 0, 0 + index: -1 +suizi_3 + rotate: false + xy: 708, 200 + size: 24, 30 + orig: 24, 30 + offset: 0, 0 + index: -1 +suizi_31 + rotate: false + xy: 744, 732 + size: 10, 22 + orig: 10, 22 + offset: 0, 0 + index: -1 +suizi_32 + rotate: false + xy: 700, 177 + size: 6, 23 + orig: 6, 23 + offset: 0, 0 + index: -1 +suizi_4 + rotate: false + xy: 617, 135 + size: 14, 55 + orig: 14, 55 + offset: 0, 0 + index: -1 +suizi_44 + rotate: false + xy: 708, 176 + size: 11, 22 + orig: 11, 22 + offset: 0, 0 + index: -1 +suizi_45 + rotate: false + xy: 408, 14 + size: 21, 16 + orig: 21, 16 + offset: 0, 0 + index: -1 +suizi_46 + rotate: false + xy: 20, 5 + size: 23, 8 + orig: 23, 8 + offset: 0, 0 + index: -1 +suizi_6 + rotate: false + xy: 737, 296 + size: 17, 35 + orig: 17, 35 + offset: 0, 0 + index: -1 +suizi_7 + rotate: false + xy: 615, 241 + size: 36, 9 + orig: 36, 9 + offset: 0, 0 + index: -1 +suizi_8 + rotate: false + xy: 720, 477 + size: 34, 48 + orig: 34, 48 + offset: 0, 0 + index: -1 +toufa_14 + rotate: false + xy: 345, 4 + size: 33, 26 + orig: 33, 26 + offset: 0, 0 + index: -1 +toufa_15 + rotate: false + xy: 633, 140 + size: 19, 15 + orig: 19, 15 + offset: 0, 0 + index: -1 +toufa_16 + rotate: false + xy: 471, 416 + size: 28, 21 + orig: 28, 21 + offset: 0, 0 + index: -1 +toufa_17 + rotate: false + xy: 591, 135 + size: 24, 55 + orig: 24, 55 + offset: 0, 0 + index: -1 +toufa_18 + rotate: false + xy: 380, 8 + size: 26, 22 + orig: 26, 22 + offset: 0, 0 + index: -1 +toufa_19 + rotate: false + xy: 522, 410 + size: 13, 27 + orig: 13, 27 + offset: 0, 0 + index: -1 +toufa_20 + rotate: false + xy: 734, 177 + size: 20, 32 + orig: 20, 32 + offset: 0, 0 + index: -1 +toufa_21 + rotate: false + xy: 717, 333 + size: 37, 23 + orig: 37, 23 + offset: 0, 0 + index: -1 +toufa_28 + rotate: false + xy: 622, 192 + size: 21, 38 + orig: 21, 38 + offset: 0, 0 + index: -1 +toufa_29 + rotate: false + xy: 744, 695 + size: 7, 35 + orig: 7, 35 + offset: 0, 0 + index: -1 +touhua_13 + rotate: false + xy: 501, 418 + size: 19, 19 + orig: 19, 19 + offset: 0, 0 + index: -1 +tpufa_22 + rotate: false + xy: 717, 358 + size: 37, 34 + orig: 37, 34 + offset: 0, 0 + index: -1 +yaobubujian_60 + rotate: false + xy: 561, 17 + size: 25, 19 + orig: 25, 19 + offset: 0, 0 + index: -1 +yaobuguajian_55 + rotate: false + xy: 432, 2 + size: 42, 42 + orig: 42, 42 + offset: 0, 0 + index: -1 +yaodai_63 + rotate: false + xy: 497, 183 + size: 51, 54 + orig: 51, 54 + offset: 0, 0 + index: -1 +yaodai_65 + rotate: false + xy: 717, 270 + size: 18, 61 + orig: 18, 61 + offset: 0, 0 + index: -1 +yezi_1 + rotate: false + xy: 588, 2 + size: 34, 36 + orig: 34, 36 + offset: 0, 0 + index: -1 +yibai_35 + rotate: false + xy: 137, 14 + size: 79, 254 + orig: 79, 254 + offset: 0, 0 + index: -1 +yibai_64 + rotate: false + xy: 439, 80 + size: 63, 75 + orig: 63, 75 + offset: 0, 0 + index: -1 +yibai_67 + rotate: false + xy: 641, 397 + size: 54, 128 + orig: 54, 128 + offset: 0, 0 + index: -1 +yidai_66 + rotate: false + xy: 296, 151 + size: 137, 85 + orig: 137, 85 + offset: 0, 0 + index: -1 +yixiu_36 + rotate: false + xy: 290, 2 + size: 53, 84 + orig: 53, 84 + offset: 0, 0 + index: -1 +yixiu_39 + rotate: false + xy: 218, 96 + size: 76, 172 + orig: 76, 172 + offset: 0, 0 + index: -1 +yixiu_42 + rotate: false + xy: 615, 252 + size: 48, 90 + orig: 48, 90 + offset: 0, 0 + index: -1 +yixiu_50 + rotate: false + xy: 296, 88 + size: 141, 61 + orig: 141, 61 + offset: 0, 0 + index: -1 +yixiu_51 + rotate: false + xy: 300, 238 + size: 190, 76 + orig: 190, 76 + offset: 0, 0 + index: -1 +yixiu_54 + rotate: false + xy: 665, 271 + size: 50, 82 + orig: 50, 82 + offset: 0, 0 + index: -1 +yixiu_87 + rotate: false + xy: 505, 47 + size: 54, 36 + orig: 54, 36 + offset: 0, 0 + index: -1 +yixiu_89 + rotate: false + xy: 588, 87 + size: 25, 46 + orig: 25, 46 + offset: 0, 0 + index: -1 +yixiu_90 + rotate: false + xy: 512, 239 + size: 55, 79 + orig: 55, 79 + offset: 0, 0 + index: -1 +youfa_96 + rotate: false + xy: 2, 413 + size: 412, 341 + orig: 412, 341 + offset: 0, 0 + index: -1 +zanzi_23 + rotate: false + xy: 432, 46 + size: 71, 32 + orig: 71, 32 + offset: 0, 0 + index: -1 +zhengyan_12 + rotate: false + xy: 492, 244 + size: 9, 5 + orig: 9, 5 + offset: 0, 0 + index: -1 +zhengyan_26 + rotate: false + xy: 641, 347 + size: 9, 6 + orig: 9, 6 + offset: 0, 0 + index: -1 diff --git a/Assets/ManagedResources/Spine/c_0038_02/c_0038_02.atlas.txt.meta b/Assets/ManagedResources/Spine/c_0038_02/c_0038_02.atlas.txt.meta new file mode 100644 index 0000000000..33cbb7cf74 --- /dev/null +++ b/Assets/ManagedResources/Spine/c_0038_02/c_0038_02.atlas.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7248ddd326502b44f8567412c6509a7a +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Spine/c_0038_02/c_0038_02.png b/Assets/ManagedResources/Spine/c_0038_02/c_0038_02.png new file mode 100644 index 0000000000..ae0a39803e Binary files /dev/null and b/Assets/ManagedResources/Spine/c_0038_02/c_0038_02.png differ diff --git a/Assets/ManagedResources/Spine/c_0038_02/c_0038_02.png.meta b/Assets/ManagedResources/Spine/c_0038_02/c_0038_02.png.meta new file mode 100644 index 0000000000..d7f1a115b6 --- /dev/null +++ b/Assets/ManagedResources/Spine/c_0038_02/c_0038_02.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 79d8d5370bac9b942a27b7309bd685dc +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 0a6df35b513eb884cb95a54c2cf727c1 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Spine/c_0038_02/c_0038_02.skel.bytes b/Assets/ManagedResources/Spine/c_0038_02/c_0038_02.skel.bytes new file mode 100644 index 0000000000..3bd4cd9dde Binary files /dev/null and b/Assets/ManagedResources/Spine/c_0038_02/c_0038_02.skel.bytes differ diff --git a/Assets/ManagedResources/Spine/c_0038_02/c_0038_02.skel.bytes.meta b/Assets/ManagedResources/Spine/c_0038_02/c_0038_02.skel.bytes.meta new file mode 100644 index 0000000000..3a11386b0e --- /dev/null +++ b/Assets/ManagedResources/Spine/c_0038_02/c_0038_02.skel.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 00dadf9896b45624587e4bf0bb1ad785 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Spine/c_0038_02/c_0038_02_Atlas.asset b/Assets/ManagedResources/Spine/c_0038_02/c_0038_02_Atlas.asset new file mode 100644 index 0000000000..3972e562a8 --- /dev/null +++ b/Assets/ManagedResources/Spine/c_0038_02/c_0038_02_Atlas.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: a6b194f808b1af6499c93410e504af42, type: 3} + m_Name: c_0038_02_Atlas + m_EditorClassIdentifier: + atlasFile: {fileID: 4900000, guid: 7248ddd326502b44f8567412c6509a7a, type: 3} + materials: + - {fileID: 2100000, guid: 995f2f1450d471048af09cd93b4a0cef, type: 2} diff --git a/Assets/ManagedResources/Spine/c_0038_02/c_0038_02_Atlas.asset.meta b/Assets/ManagedResources/Spine/c_0038_02/c_0038_02_Atlas.asset.meta new file mode 100644 index 0000000000..277c25223f --- /dev/null +++ b/Assets/ManagedResources/Spine/c_0038_02/c_0038_02_Atlas.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 25b4a2636873dfe45a49ddef3305478c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Spine/c_0038_02/c_0038_02_Material.mat b/Assets/ManagedResources/Spine/c_0038_02/c_0038_02_Material.mat new file mode 100644 index 0000000000..b25c867df2 --- /dev/null +++ b/Assets/ManagedResources/Spine/c_0038_02/c_0038_02_Material.mat @@ -0,0 +1,28 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: c_0038_02_Material + m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 79d8d5370bac9b942a27b7309bd685dc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.1 + m_Colors: [] diff --git a/Assets/ManagedResources/Spine/c_0038_02/c_0038_02_Material.mat.meta b/Assets/ManagedResources/Spine/c_0038_02/c_0038_02_Material.mat.meta new file mode 100644 index 0000000000..dac8ae99cf --- /dev/null +++ b/Assets/ManagedResources/Spine/c_0038_02/c_0038_02_Material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 995f2f1450d471048af09cd93b4a0cef +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Spine/c_0038_02/c_0038_02_SkeletonData.asset b/Assets/ManagedResources/Spine/c_0038_02/c_0038_02_SkeletonData.asset new file mode 100644 index 0000000000..898a09282e --- /dev/null +++ b/Assets/ManagedResources/Spine/c_0038_02/c_0038_02_SkeletonData.asset @@ -0,0 +1,23 @@ +%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: f1b3b4b945939a54ea0b23d3396115fb, type: 3} + m_Name: c_0038_02_SkeletonData + m_EditorClassIdentifier: + atlasAssets: + - {fileID: 11400000, guid: 25b4a2636873dfe45a49ddef3305478c, type: 2} + scale: 0.01 + skeletonJSON: {fileID: 4900000, guid: 00dadf9896b45624587e4bf0bb1ad785, type: 3} + fromAnimation: [] + toAnimation: [] + duration: [] + defaultMix: 0.2 + controller: {fileID: 0} diff --git a/Assets/ManagedResources/Spine/c_0038_02/c_0038_02_SkeletonData.asset.meta b/Assets/ManagedResources/Spine/c_0038_02/c_0038_02_SkeletonData.asset.meta new file mode 100644 index 0000000000..5c5ad9f3d8 --- /dev/null +++ b/Assets/ManagedResources/Spine/c_0038_02/c_0038_02_SkeletonData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c1e145f8fdef1c94ea283be131e1b05b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Spine/c_0043_02.meta b/Assets/ManagedResources/Spine/c_0043_02.meta new file mode 100644 index 0000000000..d5659892c0 --- /dev/null +++ b/Assets/ManagedResources/Spine/c_0043_02.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9db55c8ee6f5cc249aba08e424665de8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Spine/c_0043_02/c_0043_02.atlas.txt b/Assets/ManagedResources/Spine/c_0043_02/c_0043_02.atlas.txt new file mode 100644 index 0000000000..09e1f0b682 --- /dev/null +++ b/Assets/ManagedResources/Spine/c_0043_02/c_0043_02.atlas.txt @@ -0,0 +1,818 @@ + +c_0043_02.png +size: 709,709 +format: RGBA8888 +filter: Linear,Linear +repeat: none +biyan_33 + rotate: false + xy: 167, 424 + size: 11, 6 + orig: 11, 6 + offset: 0, 0 + index: -1 +biyan_34 + rotate: false + xy: 528, 146 + size: 7, 5 + orig: 7, 5 + offset: 0, 0 + index: -1 +bozi_57 + rotate: false + xy: 298, 21 + size: 14, 36 + orig: 14, 36 + offset: 0, 0 + index: -1 +chibang_110 + rotate: false + xy: 348, 20 + size: 11, 41 + orig: 11, 41 + offset: 0, 0 + index: -1 +chibang_111 + rotate: false + xy: 605, 151 + size: 47, 18 + orig: 47, 18 + offset: 0, 0 + index: -1 +chibang_112 + rotate: false + xy: 625, 76 + size: 19, 25 + orig: 19, 25 + offset: 0, 0 + index: -1 +chibang_37 + rotate: false + xy: 314, 21 + size: 32, 40 + orig: 32, 40 + offset: 0, 0 + index: -1 +fatuan_45 + rotate: false + xy: 248, 2 + size: 16, 19 + orig: 16, 19 + offset: 0, 0 + index: -1 +houtoufa_108 + rotate: false + xy: 195, 93 + size: 42, 82 + orig: 42, 82 + offset: 0, 0 + index: -1 +houtoufa_109 + rotate: false + xy: 245, 284 + size: 64, 128 + orig: 64, 128 + offset: 0, 0 + index: -1 +lian_46 + rotate: false + xy: 615, 451 + size: 34, 41 + orig: 34, 41 + offset: 0, 0 + index: -1 +meimao_29 + rotate: false + xy: 278, 2 + size: 7, 4 + orig: 7, 4 + offset: 0, 0 + index: -1 +meimao_30 + rotate: false + xy: 266, 2 + size: 10, 4 + orig: 10, 4 + offset: 0, 0 + index: -1 +niaochibang_115 + rotate: false + xy: 583, 224 + size: 65, 53 + orig: 65, 53 + offset: 0, 0 + index: -1 +niaoshenzi_117 + rotate: false + xy: 605, 171 + size: 51, 51 + orig: 51, 51 + offset: 0, 0 + index: -1 +niaotou_114 + rotate: false + xy: 79, 2 + size: 36, 32 + orig: 36, 32 + offset: 0, 0 + index: -1 +niaoweiba_116 + rotate: false + xy: 645, 564 + size: 62, 48 + orig: 62, 48 + offset: 0, 0 + index: -1 +niaoweiba_118 + rotate: false + xy: 190, 27 + size: 41, 64 + orig: 41, 64 + offset: 0, 0 + index: -1 +paopaoxiu_2 + rotate: false + xy: 528, 153 + size: 45, 28 + orig: 45, 28 + offset: 0, 0 + index: -1 +piaodai_104 + rotate: false + xy: 86, 141 + size: 65, 88 + orig: 65, 88 + offset: 0, 0 + index: -1 +piaodai_105 + rotate: false + xy: 424, 295 + size: 51, 119 + orig: 51, 119 + offset: 0, 0 + index: -1 +piaodai_106 + rotate: false + xy: 167, 432 + size: 79, 275 + orig: 79, 275 + offset: 0, 0 + index: -1 +piaodai_107 + rotate: false + xy: 86, 418 + size: 79, 289 + orig: 79, 289 + offset: 0, 0 + index: -1 +qunbai_91 + rotate: false + xy: 607, 366 + size: 100, 83 + orig: 100, 83 + offset: 0, 0 + index: -1 +shangshen_055 + rotate: false + xy: 239, 98 + size: 67, 72 + orig: 67, 72 + offset: 0, 0 + index: -1 +shangshen_55 + rotate: false + xy: 361, 95 + size: 67, 72 + orig: 67, 72 + offset: 0, 0 + index: -1 +suizi_11 + rotate: false + xy: 665, 506 + size: 11, 12 + orig: 11, 12 + offset: 0, 0 + index: -1 +suizi_12 + rotate: false + xy: 552, 64 + size: 9, 15 + orig: 9, 15 + offset: 0, 0 + index: -1 +suizi_13 + rotate: false + xy: 445, 183 + size: 9, 16 + orig: 9, 16 + offset: 0, 0 + index: -1 +suizi_14 + rotate: false + xy: 266, 8 + size: 14, 13 + orig: 14, 13 + offset: 0, 0 + index: -1 +suizi_15 + rotate: false + xy: 175, 17 + size: 13, 7 + orig: 13, 7 + offset: 0, 0 + index: -1 +toufa_23 + rotate: false + xy: 552, 81 + size: 14, 22 + orig: 14, 22 + offset: 0, 0 + index: -1 +toufa_24 + rotate: false + xy: 229, 2 + size: 17, 19 + orig: 17, 19 + offset: 0, 0 + index: -1 +toufa_25 + rotate: false + xy: 147, 2 + size: 26, 22 + orig: 26, 22 + offset: 0, 0 + index: -1 +toufa_26 + rotate: false + xy: 339, 493 + size: 7, 21 + orig: 7, 21 + offset: 0, 0 + index: -1 +toufa_27 + rotate: false + xy: 513, 66 + size: 11, 43 + orig: 11, 43 + offset: 0, 0 + index: -1 +toufa_28 + rotate: false + xy: 416, 5 + size: 13, 61 + orig: 13, 61 + offset: 0, 0 + index: -1 +toufa_35 + rotate: false + xy: 548, 105 + size: 22, 46 + orig: 22, 46 + offset: 0, 0 + index: -1 +toufa_36 + rotate: false + xy: 646, 83 + size: 26, 21 + orig: 26, 21 + offset: 0, 0 + index: -1 +toufa_41 + rotate: false + xy: 678, 467 + size: 29, 51 + orig: 29, 51 + offset: 0, 0 + index: -1 +toufa_42 + rotate: false + xy: 361, 13 + size: 30, 53 + orig: 30, 53 + offset: 0, 0 + index: -1 +toufa_43 + rotate: false + xy: 654, 142 + size: 36, 21 + orig: 36, 21 + offset: 0, 0 + index: -1 +toufa_58 + rotate: false + xy: 699, 304 + size: 8, 60 + orig: 8, 60 + offset: 0, 0 + index: -1 +toufa_59 + rotate: false + xy: 471, 455 + size: 6, 36 + orig: 6, 36 + offset: 0, 0 + index: -1 +toushi_44 + rotate: false + xy: 678, 451 + size: 25, 14 + orig: 25, 14 + offset: 0, 0 + index: -1 +wuqi_71 + rotate: false + xy: 2, 152 + size: 82, 555 + orig: 82, 555 + offset: 0, 0 + index: -1 +wuqisui_66 + rotate: false + xy: 526, 56 + size: 24, 37 + orig: 24, 37 + offset: 0, 0 + index: -1 +wuqisui_67 + rotate: false + xy: 393, 12 + size: 21, 54 + orig: 21, 54 + offset: 0, 0 + index: -1 +wuqisui_68 + rotate: false + xy: 692, 121 + size: 15, 42 + orig: 15, 42 + offset: 0, 0 + index: -1 +xiezi_096 + rotate: false + xy: 623, 496 + size: 40, 61 + orig: 40, 61 + offset: 0, 0 + index: -1 +xiezi_102 + rotate: false + xy: 420, 172 + size: 23, 27 + orig: 23, 27 + offset: 0, 0 + index: -1 +xiezi_94 + rotate: false + xy: 282, 8 + size: 14, 13 + orig: 14, 13 + offset: 0, 0 + index: -1 +xiezi_95 + rotate: false + xy: 431, 15 + size: 21, 39 + orig: 21, 39 + offset: 0, 0 + index: -1 +xiezi_96 + rotate: false + xy: 658, 165 + size: 40, 61 + orig: 40, 61 + offset: 0, 0 + index: -1 +xiezi_97 + rotate: false + xy: 572, 102 + size: 31, 40 + orig: 31, 40 + offset: 0, 0 + index: -1 +yao_10 + rotate: false + xy: 575, 144 + size: 28, 37 + orig: 28, 37 + offset: 0, 0 + index: -1 +yaodai_21 + rotate: false + xy: 190, 2 + size: 37, 23 + orig: 37, 23 + offset: 0, 0 + index: -1 +yaomao_17 + rotate: false + xy: 430, 97 + size: 40, 72 + orig: 40, 72 + offset: 0, 0 + index: -1 +yaomao_19 + rotate: false + xy: 308, 104 + size: 51, 71 + orig: 51, 71 + offset: 0, 0 + index: -1 +yaozhuangshi_16 + rotate: false + xy: 650, 228 + size: 36, 49 + orig: 36, 49 + offset: 0, 0 + index: -1 +yibai_103 + rotate: false + xy: 248, 516 + size: 98, 191 + orig: 98, 191 + offset: 0, 0 + index: -1 +youdatui_092 + rotate: false + xy: 195, 289 + size: 48, 141 + orig: 48, 141 + offset: 0, 0 + index: -1 +youdatui_92 + rotate: false + xy: 311, 271 + size: 48, 141 + orig: 48, 141 + offset: 0, 0 + index: -1 +younei_54 + rotate: false + xy: 665, 520 + size: 42, 42 + orig: 42, 42 + offset: 0, 0 + index: -1 +youshou_8 + rotate: false + xy: 117, 2 + size: 28, 32 + orig: 28, 32 + offset: 0, 0 + index: -1 +youshoubi_60 + rotate: false + xy: 472, 111 + size: 52, 33 + orig: 52, 33 + offset: 0, 0 + index: -1 +youshoubi_9 + rotate: false + xy: 430, 75 + size: 36, 20 + orig: 36, 20 + offset: 0, 0 + index: -1 +youxiaotui_093 + rotate: false + xy: 195, 177 + size: 43, 110 + orig: 43, 110 + offset: 0, 0 + index: -1 +youxiaotui_93 + rotate: false + xy: 240, 172 + size: 43, 110 + orig: 43, 110 + offset: 0, 0 + index: -1 +youyibai_52 + rotate: false + xy: 248, 414 + size: 89, 100 + orig: 89, 100 + offset: 0, 0 + index: -1 +youyihou_61 + rotate: false + xy: 472, 146 + size: 54, 40 + orig: 54, 40 + offset: 0, 0 + index: -1 +youyiling_53 + rotate: false + xy: 311, 63 + size: 45, 39 + orig: 45, 39 + offset: 0, 0 + index: -1 +youyinei_62 + rotate: false + xy: 472, 78 + size: 39, 31 + orig: 39, 31 + offset: 0, 0 + index: -1 +youyixiu_5 + rotate: false + xy: 688, 239 + size: 19, 63 + orig: 19, 63 + offset: 0, 0 + index: -1 +youyixiubai_22 + rotate: false + xy: 420, 201 + size: 35, 87 + orig: 35, 87 + offset: 0, 0 + index: -1 +youyixiubai_7 + rotate: false + xy: 147, 26 + size: 41, 94 + orig: 41, 94 + offset: 0, 0 + index: -1 +youyixiuxia_6 + rotate: false + xy: 86, 231 + size: 65, 185 + orig: 65, 185 + offset: 0, 0 + index: -1 +youyumao_47 + rotate: false + xy: 607, 314 + size: 90, 50 + orig: 90, 50 + offset: 0, 0 + index: -1 +youyumao_48 + rotate: false + xy: 484, 494 + size: 137, 63 + orig: 137, 63 + offset: 0, 0 + index: -1 +youyumao_49 + rotate: false + xy: 477, 375 + size: 128, 74 + orig: 128, 74 + offset: 0, 0 + index: -1 +youyumao_50 + rotate: false + xy: 348, 493 + size: 134, 100 + orig: 134, 100 + offset: 0, 0 + index: -1 +youyumao_51 + rotate: false + xy: 348, 595 + size: 138, 112 + orig: 138, 112 + offset: 0, 0 + index: -1 +yumao_113 + rotate: false + xy: 2, 4 + size: 61, 11 + orig: 61, 11 + offset: 0, 0 + index: -1 +yumao_18 + rotate: false + xy: 361, 290 + size: 61, 124 + orig: 61, 124 + offset: 0, 0 + index: -1 +yumao_20 + rotate: false + xy: 2, 17 + size: 75, 133 + orig: 75, 133 + offset: 0, 0 + index: -1 +zhengyan_31 + rotate: false + xy: 285, 276 + size: 7, 6 + orig: 7, 6 + offset: 0, 0 + index: -1 +zhengyan_32 + rotate: false + xy: 665, 497 + size: 11, 7 + orig: 11, 7 + offset: 0, 0 + index: -1 +zuobai_86 + rotate: false + xy: 635, 614 + size: 71, 39 + orig: 71, 39 + offset: 0, 0 + index: -1 +zuodatui_098 + rotate: false + xy: 153, 270 + size: 40, 146 + orig: 40, 146 + offset: 0, 0 + index: -1 +zuodatui_98 + rotate: false + xy: 153, 122 + size: 40, 146 + orig: 40, 146 + offset: 0, 0 + index: -1 +zuonei_39 + rotate: false + xy: 457, 188 + size: 73, 35 + orig: 73, 35 + offset: 0, 0 + index: -1 +zuoneibai_89 + rotate: false + xy: 532, 183 + size: 71, 39 + orig: 71, 39 + offset: 0, 0 + index: -1 +zuoshou_87 + rotate: false + xy: 605, 101 + size: 18, 48 + orig: 18, 48 + offset: 0, 0 + index: -1 +zuoshoubi_40 + rotate: false + xy: 526, 95 + size: 20, 49 + orig: 20, 49 + offset: 0, 0 + index: -1 +zuoshoubi_88 + rotate: false + xy: 548, 224 + size: 33, 57 + orig: 33, 57 + offset: 0, 0 + index: -1 +zuoshouzhi_64 + rotate: false + xy: 679, 110 + size: 10, 30 + orig: 10, 30 + offset: 0, 0 + index: -1 +zuoshouzhi_65 + rotate: false + xy: 568, 84 + size: 8, 16 + orig: 8, 16 + offset: 0, 0 + index: -1 +zuoxiaotui_0101 + rotate: false + xy: 366, 169 + size: 25, 119 + orig: 25, 119 + offset: 0, 0 + index: -1 +zuoxiaotui_101 + rotate: false + xy: 393, 169 + size: 25, 119 + orig: 25, 119 + offset: 0, 0 + index: -1 +zuoxiezi_100 + rotate: false + xy: 651, 451 + size: 25, 43 + orig: 25, 43 + offset: 0, 0 + index: -1 +zuoxiezi_99 + rotate: false + xy: 625, 103 + size: 19, 46 + orig: 19, 46 + offset: 0, 0 + index: -1 +zuoyihou_56 + rotate: false + xy: 239, 59 + size: 70, 37 + orig: 70, 37 + offset: 0, 0 + index: -1 +zuoyiling_38 + rotate: false + xy: 477, 283 + size: 109, 33 + orig: 109, 33 + offset: 0, 0 + index: -1 +zuoyinei_63 + rotate: false + xy: 588, 279 + size: 98, 33 + orig: 98, 33 + offset: 0, 0 + index: -1 +zuoyixiu_1 + rotate: false + xy: 488, 559 + size: 155, 53 + orig: 155, 53 + offset: 0, 0 + index: -1 +zuoyixiu_78 + rotate: false + xy: 339, 416 + size: 130, 75 + orig: 130, 75 + offset: 0, 0 + index: -1 +zuoyixiu_85 + rotate: false + xy: 484, 451 + size: 129, 41 + orig: 129, 41 + offset: 0, 0 + index: -1 +zuoyixiuhou_90 + rotate: false + xy: 457, 225 + size: 89, 56 + orig: 89, 56 + offset: 0, 0 + index: -1 +zuoyumao_3 + rotate: false + xy: 233, 23 + size: 63, 34 + orig: 63, 34 + offset: 0, 0 + index: -1 +zuoyumao_4 + rotate: false + xy: 79, 36 + size: 66, 103 + orig: 66, 103 + offset: 0, 0 + index: -1 +zuoyumao_79 + rotate: false + xy: 358, 68 + size: 68, 25 + orig: 68, 25 + offset: 0, 0 + index: -1 +zuoyumao_80 + rotate: false + xy: 635, 655 + size: 72, 52 + orig: 72, 52 + offset: 0, 0 + index: -1 +zuoyumao_81 + rotate: false + xy: 477, 318 + size: 128, 55 + orig: 128, 55 + offset: 0, 0 + index: -1 +zuoyumao_82 + rotate: false + xy: 488, 614 + size: 145, 93 + orig: 145, 93 + offset: 0, 0 + index: -1 +zuoyumao_83 + rotate: false + xy: 285, 177 + size: 79, 92 + orig: 79, 92 + offset: 0, 0 + index: -1 +zuoyumao_84 + rotate: false + xy: 646, 106 + size: 31, 34 + orig: 31, 34 + offset: 0, 0 + index: -1 diff --git a/Assets/ManagedResources/Spine/c_0043_02/c_0043_02.atlas.txt.meta b/Assets/ManagedResources/Spine/c_0043_02/c_0043_02.atlas.txt.meta new file mode 100644 index 0000000000..0ec9f09cb4 --- /dev/null +++ b/Assets/ManagedResources/Spine/c_0043_02/c_0043_02.atlas.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f123609f57727c240928a00b3358a436 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Spine/c_0043_02/c_0043_02.png b/Assets/ManagedResources/Spine/c_0043_02/c_0043_02.png new file mode 100644 index 0000000000..1b179699b0 Binary files /dev/null and b/Assets/ManagedResources/Spine/c_0043_02/c_0043_02.png differ diff --git a/Assets/ManagedResources/Spine/c_0043_02/c_0043_02.png.meta b/Assets/ManagedResources/Spine/c_0043_02/c_0043_02.png.meta new file mode 100644 index 0000000000..a7c0859fb3 --- /dev/null +++ b/Assets/ManagedResources/Spine/c_0043_02/c_0043_02.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 2a171f13f8e8dea458a9e6dceb0a55d2 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 7a4fa850a02ba004fb41ff08849fa814 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Spine/c_0043_02/c_0043_02.skel.bytes b/Assets/ManagedResources/Spine/c_0043_02/c_0043_02.skel.bytes new file mode 100644 index 0000000000..8269487592 Binary files /dev/null and b/Assets/ManagedResources/Spine/c_0043_02/c_0043_02.skel.bytes differ diff --git a/Assets/ManagedResources/Spine/c_0043_02/c_0043_02.skel.bytes.meta b/Assets/ManagedResources/Spine/c_0043_02/c_0043_02.skel.bytes.meta new file mode 100644 index 0000000000..91d7dc6764 --- /dev/null +++ b/Assets/ManagedResources/Spine/c_0043_02/c_0043_02.skel.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0f54a1ba37e9fe9468a4ce3f24c30c62 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Spine/c_0043_02/c_0043_02_Atlas.asset b/Assets/ManagedResources/Spine/c_0043_02/c_0043_02_Atlas.asset new file mode 100644 index 0000000000..360a3788bc --- /dev/null +++ b/Assets/ManagedResources/Spine/c_0043_02/c_0043_02_Atlas.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: a6b194f808b1af6499c93410e504af42, type: 3} + m_Name: c_0043_02_Atlas + m_EditorClassIdentifier: + atlasFile: {fileID: 4900000, guid: f123609f57727c240928a00b3358a436, type: 3} + materials: + - {fileID: 2100000, guid: c1a585292e809e64a99d426a2d005001, type: 2} diff --git a/Assets/ManagedResources/Spine/c_0043_02/c_0043_02_Atlas.asset.meta b/Assets/ManagedResources/Spine/c_0043_02/c_0043_02_Atlas.asset.meta new file mode 100644 index 0000000000..4bfd34f5ac --- /dev/null +++ b/Assets/ManagedResources/Spine/c_0043_02/c_0043_02_Atlas.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 363467aba56d71f4ab2740ad6fb222da +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Spine/c_0043_02/c_0043_02_Material.mat b/Assets/ManagedResources/Spine/c_0043_02/c_0043_02_Material.mat new file mode 100644 index 0000000000..c9695ad7d0 --- /dev/null +++ b/Assets/ManagedResources/Spine/c_0043_02/c_0043_02_Material.mat @@ -0,0 +1,28 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: c_0043_02_Material + m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 2a171f13f8e8dea458a9e6dceb0a55d2, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.1 + m_Colors: [] diff --git a/Assets/ManagedResources/Spine/c_0043_02/c_0043_02_Material.mat.meta b/Assets/ManagedResources/Spine/c_0043_02/c_0043_02_Material.mat.meta new file mode 100644 index 0000000000..7e053460b9 --- /dev/null +++ b/Assets/ManagedResources/Spine/c_0043_02/c_0043_02_Material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c1a585292e809e64a99d426a2d005001 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Spine/c_0043_02/c_0043_02_SkeletonData.asset b/Assets/ManagedResources/Spine/c_0043_02/c_0043_02_SkeletonData.asset new file mode 100644 index 0000000000..befb345b91 --- /dev/null +++ b/Assets/ManagedResources/Spine/c_0043_02/c_0043_02_SkeletonData.asset @@ -0,0 +1,23 @@ +%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: f1b3b4b945939a54ea0b23d3396115fb, type: 3} + m_Name: c_0043_02_SkeletonData + m_EditorClassIdentifier: + atlasAssets: + - {fileID: 11400000, guid: 363467aba56d71f4ab2740ad6fb222da, type: 2} + scale: 0.01 + skeletonJSON: {fileID: 4900000, guid: 0f54a1ba37e9fe9468a4ce3f24c30c62, type: 3} + fromAnimation: [] + toAnimation: [] + duration: [] + defaultMix: 0.2 + controller: {fileID: 0} diff --git a/Assets/ManagedResources/Spine/c_0043_02/c_0043_02_SkeletonData.asset.meta b/Assets/ManagedResources/Spine/c_0043_02/c_0043_02_SkeletonData.asset.meta new file mode 100644 index 0000000000..799302c25a --- /dev/null +++ b/Assets/ManagedResources/Spine/c_0043_02/c_0043_02_SkeletonData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 50740b2703cf16348bf1b361abc70d14 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 3260f6e4fc..125f0f64e4 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1679,6 +1679,7 @@ HELP_TYPE = { WishCard = 97,--心愿抽卡 JourneyWithWind = 98,--缥缈之旅 ShanHeShiLian = 96,--山河试炼 + AgeTip = 104,--适龄提示 } NumToComplexFont = { diff --git a/Assets/ManagedResources/~Lua/Framework/GameDataBase.lua b/Assets/ManagedResources/~Lua/Framework/GameDataBase.lua index 73055d40d7..b305a51851 100644 --- a/Assets/ManagedResources/~Lua/Framework/GameDataBase.lua +++ b/Assets/ManagedResources/~Lua/Framework/GameDataBase.lua @@ -118,7 +118,18 @@ GameDataBase.SheetLineBase.__newindex = readonlyMT GameDataBase.SheetLineBase.__index = function(t,k) local index = t.m_fIds[k] if index then - return t.val[index] + local val = t.val[index] + -- ************************* + -- 提审服部分资源替换,特殊处理 + if SERVER_VERSION == 1 then + if (val == "live2d_c_0038" and t.val[1] == 2004) + or (val == "live2d_c_0043" and t.val[1] == 2008) + then + return val.."_02" + end + end + -- ************************* + return val end end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 2ddc39d984..cdceec4e93 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -1536,10 +1536,14 @@ local passivityList = { [91] = function(role, args,id,judge) local f1 = args[1] local ct = args[2] - local passivityDamaging = function(func, caster, damage,skill, dotType, bCrit) + local passivityDamaging = function(func, caster, damage,skill, dotType, bCrit,damageType) if skill and not skill.isTriggerJudge and judge==1 then return end + if damageType==3 then + return + end + --处理伏虎觉醒十星附加的额外技能,额外技能不触发这个特性 2020/11/17 wangzhenxing if skill and skill.type== BattleSkillType.Extra and skill.owner.roleId==10015 and judge==1 then return @@ -3298,13 +3302,15 @@ local passivityList = { local f1 = args[1] local dot = args[2] local f2 = args[3] - local i1 = args[3] + local i1 = args[4] -- 技能后后 local onBeSkillCastEnd = function(skill) if skill.type == BattleSkillType.Normal and skill.owner and skill.owner.camp~=role.camp then local attack = role:GetRoleData(RoleDataName.Attack) local damage = floor(BattleUtil.ErrorCorrection(attack * f2)) + --持续回合数特殊处理,处理中毒等少触发一回合的情况 by:wangzhenxing 2021/08/26 17:58 + i1=i1+1 BattleUtil.RandomDot(f1, dot, role, skill.owner, i1, 1, damage) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua index a52adccc28..46430a6ce6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua @@ -103,10 +103,12 @@ end function DeathPosInfoPanel:AddListener() Game.GlobalEvent:AddEvent(GameEvent.Guild.RefreshDeathPosStatus, this.RefreshPanel) + Game.GlobalEvent:AddEvent(GameEvent.Guild.RefreshFirstChangeData, this.RefreshGuildNameAndServerName) end function DeathPosInfoPanel:RemoveListener() Game.GlobalEvent:RemoveEvent(GameEvent.Guild.RefreshDeathPosStatus, this.RefreshPanel) + Game.GlobalEvent:RemoveEvent(GameEvent.Guild.RefreshFirstChangeData, this.RefreshGuildNameAndServerName) end function DeathPosInfoPanel:OnOpen(...) local args={...} @@ -180,6 +182,7 @@ function this.RefreshPanel() end --刷新第一名公会 服务器 名字信息 +--为什么 再onshow 调一次 事件监听又调用一次呢 有可能刷新界面的时候 推送还没有过来 function this.RefreshGuildNameAndServerName() local data=DeathPosManager.GetGuildInfoData() for key, value in pairs(data) do @@ -190,15 +193,15 @@ function this.RefreshGuildNameAndServerName() if value.serverName and value.serverName ~= "" then guildServer = value.serverName end - this.curGuildName.text=guildName~="" and guildName or Language[10086] --设置公会名称 没有占据显示无 - this.curGuildserverName.text = guildServer or "" - if not guildServer or guildServer == "" then - this.curGuildserverName.gameObject:SetActive(false) - else - this.curGuildserverName.gameObject:SetActive(true) - end end end + this.curGuildName.text=guildName~="" and guildName or Language[10086] --设置公会名称 没有占据显示无 + this.curGuildserverName.text = guildServer or "" + if not guildServer or guildServer == "" then + this.curGuildserverName.gameObject:SetActive(false) + else + this.curGuildserverName.gameObject:SetActive(true) + end end --设置敌人编队 diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index fa6d5caf0f..57a660d68f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -49,6 +49,8 @@ function this:InitComponent() this.UserBtnText = Util.GetGameObject(this.loginPart, "userBtn/Text"):GetComponent("Text") this.btnUser = Util.GetGameObject(this.loginPart, "btnUser") this.btnNotice = Util.GetGameObject(this.loginPart, "btnNotice") + this.btnAgeTip = Util.GetGameObject(this.loginPart, "btnAgeTip") + this.btnAgeTipPosition=this.btnAgeTip:GetComponent("RectTransform").localPosition this.btnNotice:SetActive(IsShowNotice) @@ -133,6 +135,9 @@ function this:BindEvent() Util.AddClick(this.btnNotice, function() this.ShowNotice() end) + Util.AddClick(this.btnAgeTip, function() + UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.AgeTip,this.btnAgeTipPosition.x,this.btnAgeTipPosition.y) + end) Util.AddClick(this.UserBtn, function() local user = PlayerPrefs.GetString(openIdkey, defaultOpenIdkey) local userPw = PlayerPrefs.GetString(openIdPw, defaultOpenIdPw)