diff --git a/Assets/arts/spines/ui/ui_get_rewards.meta b/Assets/arts/spines/ui/ui_get_rewards.meta new file mode 100644 index 000000000..32b4b37af --- /dev/null +++ b/Assets/arts/spines/ui/ui_get_rewards.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e4b57ab8506c5461d8bd04f238220c2e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards.atlas.txt b/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards.atlas.txt new file mode 100644 index 000000000..95b6ca60f --- /dev/null +++ b/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards.atlas.txt @@ -0,0 +1,21 @@ +ui_get_rewards.png +size:1024,1024 +filter:Linear,Linear +gd-hbimg +bounds:2,301,315,311 +offsets:4,10,322,324 +quan +bounds:2,39,283,260 +offsets:19,18,321,296 +tiao1 +bounds:319,594,214,18 +offsets:2,0,223,18 +yuan_1 +bounds:287,271,28,28 +offsets:3,3,34,34 +yuan_2 +bounds:319,568,24,24 +offsets:2,2,28,28 +yuan_3 +bounds:2,2,35,35 +offsets:2,2,39,39 diff --git a/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards.atlas.txt.meta b/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards.atlas.txt.meta new file mode 100644 index 000000000..ae203d28c --- /dev/null +++ b/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards.atlas.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7783ebc50b357493ebeae938310fc5dd +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards.png b/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards.png new file mode 100644 index 000000000..348364215 Binary files /dev/null and b/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards.png differ diff --git a/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards.png.meta b/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards.png.meta new file mode 100644 index 000000000..bcbce515f --- /dev/null +++ b/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 8f29db30a94984f1595868a27c45e8ce +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + 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: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards.skel.bytes b/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards.skel.bytes new file mode 100644 index 000000000..b12e401a7 Binary files /dev/null and b/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards.skel.bytes.meta b/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards.skel.bytes.meta new file mode 100644 index 000000000..87cc949c1 --- /dev/null +++ b/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards.skel.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1b3730e6c8827494eb8fc34a02e5cf06 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards_atlas.asset b/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards_atlas.asset new file mode 100644 index 000000000..301fbb60b --- /dev/null +++ b/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards_atlas.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: a6b194f808b1af6499c93410e504af42, type: 3} + m_Name: ui_get_rewards_atlas + m_EditorClassIdentifier: + textureLoadingMode: 0 + onDemandTextureLoader: {fileID: 0} + atlasFile: {fileID: 4900000, guid: 7783ebc50b357493ebeae938310fc5dd, type: 3} + materials: + - {fileID: 2100000, guid: 177ce005d4f1c4d3588544f0c4ccf9a1, type: 2} diff --git a/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards_atlas.asset.meta b/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards_atlas.asset.meta new file mode 100644 index 000000000..b09f927e4 --- /dev/null +++ b/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards_atlas.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 998d1d7f2ae134820a25d2702ff15be1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards_material.mat b/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards_material.mat new file mode 100644 index 000000000..18cf6435c --- /dev/null +++ b/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards_material.mat @@ -0,0 +1,45 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ui_get_rewards_material + m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: + - _USE8NEIGHBOURHOOD_ON + 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: 8f29db30a94984f1595868a27c45e8ce, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Cutoff: 0.1 + - _Fill: 0 + - _OutlineMipLevel: 0 + - _OutlineOpaqueAlpha: 1 + - _OutlineReferenceTexWidth: 1024 + - _OutlineSmoothness: 1 + - _OutlineWidth: 3 + - _StencilComp: 8 + - _StencilRef: 1 + - _StraightAlphaInput: 0 + - _ThresholdEnd: 0.25 + - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 + m_Colors: + - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards_material.mat.meta b/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards_material.mat.meta new file mode 100644 index 000000000..bc780fef1 --- /dev/null +++ b/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards_material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 177ce005d4f1c4d3588544f0c4ccf9a1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards_skeletondata.asset b/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards_skeletondata.asset new file mode 100644 index 000000000..50b46821f --- /dev/null +++ b/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards_skeletondata.asset @@ -0,0 +1,31 @@ +%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: ui_get_rewards_skeletondata + m_EditorClassIdentifier: + atlasAssets: + - {fileID: 11400000, guid: 998d1d7f2ae134820a25d2702ff15be1, type: 2} + scale: 0.01 + skeletonJSON: {fileID: 4900000, guid: 1b3730e6c8827494eb8fc34a02e5cf06, type: 3} + isUpgradingBlendModeMaterials: 0 + blendModeMaterials: + requiresBlendModeMaterials: 0 + applyAdditiveMaterial: 0 + additiveMaterials: [] + multiplyMaterials: [] + screenMaterials: [] + skeletonDataModifiers: [] + fromAnimation: [] + toAnimation: [] + duration: [] + defaultMix: 0.2 + controller: {fileID: 0} diff --git a/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards_skeletondata.asset.meta b/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards_skeletondata.asset.meta new file mode 100644 index 000000000..33d95d304 --- /dev/null +++ b/Assets/arts/spines/ui/ui_get_rewards/ui_get_rewards_skeletondata.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ac563177a82ce464b8e963fbd74dda20 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/module/chapter/chapter_manager.lua.bytes b/Assets/lua/app/module/chapter/chapter_manager.lua.bytes index 77c7e95a6..8456fbf9d 100644 Binary files a/Assets/lua/app/module/chapter/chapter_manager.lua.bytes and b/Assets/lua/app/module/chapter/chapter_manager.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/cell/chapter_box_cell.lua.bytes b/Assets/lua/app/ui/main_city/cell/chapter_box_cell.lua.bytes index 2fde729fe..ae341cd7b 100644 Binary files a/Assets/lua/app/ui/main_city/cell/chapter_box_cell.lua.bytes and b/Assets/lua/app/ui/main_city/cell/chapter_box_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes b/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes index b412b88b6..383c6800e 100644 Binary files a/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes and b/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes differ diff --git a/Assets/lua/app/ui/tips/reward_box.lua.bytes b/Assets/lua/app/ui/tips/reward_box.lua.bytes index 517368740..293ea5539 100644 Binary files a/Assets/lua/app/ui/tips/reward_box.lua.bytes and b/Assets/lua/app/ui/tips/reward_box.lua.bytes differ diff --git a/Assets/lua/app/userdata/chapter/chapter_data.lua.bytes b/Assets/lua/app/userdata/chapter/chapter_data.lua.bytes index 63cdeaab5..39a316b8b 100644 Binary files a/Assets/lua/app/userdata/chapter/chapter_data.lua.bytes and b/Assets/lua/app/userdata/chapter/chapter_data.lua.bytes differ diff --git a/Assets/prefabs/ui/common/reward_box.prefab b/Assets/prefabs/ui/common/reward_box.prefab index 72da80056..7049c3467 100644 --- a/Assets/prefabs/ui/common/reward_box.prefab +++ b/Assets/prefabs/ui/common/reward_box.prefab @@ -173,8 +173,8 @@ RectTransform: 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: -75} - m_SizeDelta: {x: 560, y: 526} + m_AnchoredPosition: {x: 0, y: 23} + m_SizeDelta: {x: 600, y: 314} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3678935609362085116 CanvasRenderer: @@ -259,12 +259,12 @@ MonoBehaviour: isDrag: 0 contentTrans: {fileID: 0} bfCell: {fileID: 2793293494285376997} - topRecoveryOffset: 10 + topRecoveryOffset: 0 downRecoveryOffset: 0 direction: 0 reverse: 0 - cellWidth: 130 - cellHeight: 130 + cellWidth: 120 + cellHeight: 120 perLineNum: 5 --- !u!1 &5831061665098914905 GameObject: @@ -295,16 +295,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1055519520518663532} - - {fileID: 948112473636008352} + m_Children: [] m_Father: {fileID: 8461932745927490369} m_RootOrder: 3 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: 264} - m_SizeDelta: {x: 127, y: 30} + m_AnchoredPosition: {x: 0, y: 245} + m_SizeDelta: {x: 300, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3318826451874818590 CanvasRenderer: @@ -345,13 +343,13 @@ MonoBehaviour: serializedVersion: 2 rgba: 4294967295 m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 + m_enableVertexGradient: 1 m_colorMode: 3 m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} + topLeft: {r: 1, g: 0.92156863, b: 0.4, a: 1} + topRight: {r: 1, g: 0.92156863, b: 0.4, a: 1} + bottomLeft: {r: 1, g: 0.972549, b: 0.7764706, a: 1} + bottomRight: {r: 1, g: 0.972549, b: 0.7764706, a: 1} m_fontColorGradientPreset: {fileID: 0} m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 @@ -361,8 +359,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 40 - m_fontSizeBase: 40 + m_fontSize: 60 + m_fontSizeBase: 60 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -403,97 +401,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &5852782196412622658 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 948112473636008352} - - component: {fileID: 7278307833875388476} - - component: {fileID: 7172097357541816492} - - component: {fileID: 8238842294707477796} - m_Layer: 5 - m_Name: r - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &948112473636008352 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5852782196412622658} - 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: 7561696808853770984} - m_RootOrder: 1 - 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: -187.5, y: 0} - m_SizeDelta: {x: 127, y: 37} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7278307833875388476 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5852782196412622658} - m_CullTransparentMesh: 1 ---- !u!114 &7172097357541816492 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5852782196412622658} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 39479e4453f65544fac7cfe3ac9647cf, type: 3} - m_Type: 1 - 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!114 &8238842294707477796 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5852782196412622658} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a825f0792e793476ba49ec4d8054a901, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Horizontal: 1 - m_Veritical: 0 --- !u!1 &5997397792976241942 GameObject: m_ObjectHideFlags: 0 @@ -528,7 +435,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 4881579303933341440} + - {fileID: 2080129651480927928} - {fileID: 189789099158778350} - {fileID: 1089235499894105475} - {fileID: 7561696808853770984} @@ -753,43 +660,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 0 ---- !u!1 &6918153226200008214 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4881579303933341440} - m_Layer: 5 - m_Name: effect_node - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4881579303933341440 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6918153226200008214} - 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: 2080129651480927928} - m_Father: {fileID: 8461932745927490369} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7513296062967194256 GameObject: m_ObjectHideFlags: 0 @@ -825,7 +695,7 @@ RectTransform: 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: -262.99908} + m_AnchoredPosition: {x: 0, y: -156.99934} m_SizeDelta: {x: 570, y: 280} m_Pivot: {x: 0, y: 0} --- !u!222 &1736876323428805345 @@ -836,88 +706,12 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7513296062967194256} m_CullTransparentMesh: 1 ---- !u!1 &9180355903025045649 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1055519520518663532} - - component: {fileID: 2073956440654685188} - - component: {fileID: 6734157198736221316} - m_Layer: 5 - m_Name: l - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1055519520518663532 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9180355903025045649} - 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: 7561696808853770984} - 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: 187.5, y: 0} - m_SizeDelta: {x: 127, y: 37} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2073956440654685188 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9180355903025045649} - m_CullTransparentMesh: 1 ---- !u!114 &6734157198736221316 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9180355903025045649} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 39479e4453f65544fac7cfe3ac9647cf, type: 3} - m_Type: 1 - 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!1001 &3758541083938911526 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 4881579303933341440} + m_TransformParent: {fileID: 8461932745927490369} m_Modifications: - target: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_Name @@ -934,7 +728,7 @@ PrefabInstance: - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: skeletonDataAsset value: - objectReference: {fileID: 11400000, guid: 430167b51bccb524bad78641bc2d877a, type: 2} + objectReference: {fileID: 11400000, guid: ac563177a82ce464b8e963fbd74dda20, type: 2} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -989,15 +783,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchoredPosition.x @@ -1005,7 +799,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchoredPosition.y - value: 260 + value: 90 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1076,15 +870,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.x - value: 0.8 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.y - value: 0.8 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.z - value: 0.8 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/proto/protocol.bytes b/Assets/proto/protocol.bytes index a4877e216..7d3e2a12e 100644 --- a/Assets/proto/protocol.bytes +++ b/Assets/proto/protocol.bytes @@ -1,5 +1,5 @@ -Û‡ +ˆˆ pb/proto/protocol.protocspb"' Act gifts ( 2 @@ -668,11 +668,12 @@ chapter_id (R chapterId& rewards ( 2 .cspb.RewardRrewards mystery (Rmystery$ max_chapter_id (R maxChapterId -max_wave (RmaxWave"H -ChapterBoxRewardReq - -chapter_id (R chapterId -wave (Rwave"g +max_wave (RmaxWave"4 + ChapterBoxes +id (Rid +boxes (Rboxes"? +ChapterBoxRewardReq( +boxes ( 2.cspb.ChapterBoxesRboxes"g ChapterBoxRewardRsp( err_code (2 .cspb.ErrCodeRerrCode& rewards ( 2 .cspb.RewardRrewards"'