From 9df807946e69fbf92526aa8eebb8cf384314b468 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Fri, 16 Aug 2024 00:07:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A9=E5=A4=A9=E4=BB=A3=E9=87=91=E5=88=B8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/GMPanel/GMTianTianXJQ.prefab | 282 +++++++++++------- .../Modules/DailyRecharge/GMTianTianXJQ.lua | 2 +- 2 files changed, 176 insertions(+), 108 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/GMPanel/GMTianTianXJQ.prefab b/Assets/ManagedResources/Prefabs/UI/GMPanel/GMTianTianXJQ.prefab index d786b17241..d11681827e 100644 --- a/Assets/ManagedResources/Prefabs/UI/GMPanel/GMTianTianXJQ.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GMPanel/GMTianTianXJQ.prefab @@ -40,7 +40,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: -27} + m_AnchoredPosition: {x: 11, y: -48} m_SizeDelta: {x: 0, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3788419070869948725 @@ -68,7 +68,7 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 1 m_Spacing: 8 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 @@ -23750,8 +23750,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: -5, y: -267} - m_SizeDelta: {x: 350, y: 128} + m_AnchoredPosition: {x: -5, y: -218} + m_SizeDelta: {x: 350, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3910918784185499778 CanvasRenderer: @@ -23781,7 +23781,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 2f8aa4834dad54c448d093eaa5d3302d, type: 3} + m_Sprite: {fileID: 21300000, guid: e7842f74ba7bf7e498aa76e925ced625, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -28750,89 +28750,6 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 ---- !u!1 &4954459129995788884 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5960610963268629625} - - component: {fileID: 8058459217211252730} - - component: {fileID: 8516812493341632085} - m_Layer: 0 - m_Name: live2d_c_0008 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5960610963268629625 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4954459129995788884} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.8, y: 0.8, z: 1} - m_Children: [] - m_Father: {fileID: 876377584539813863} - 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: 43, y: -260} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8058459217211252730 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4954459129995788884} - m_CullTransparentMesh: 0 ---- !u!114 &8516812493341632085 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4954459129995788884} - 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: 0 - 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: 8080a46b2aad358468721f84e7e2ed7a, type: 2} - initialSkinName: default - initialFlipX: 0 - initialFlipY: 0 - startingAnimation: idle - startingLoop: 1 - timeScale: 1 - freeze: 0 - unscaledTime: 0 - meshGenerator: - settings: - useClipping: 1 - zSpacing: 0 - pmaVertexColors: 1 - tintBlack: 0 - calculateTangents: 0 - addNormals: 0 - immutableTriangles: 0 --- !u!1 &4976090680222767418 GameObject: m_ObjectHideFlags: 0 @@ -42904,7 +42821,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: -1, y: 15} + m_AnchoredPosition: {x: 3.5, y: 3.2} m_SizeDelta: {x: 350, y: 128} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5906953030415200124 @@ -42928,7 +42845,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.23137257, g: 0.11764707, b: 0.0627451, a: 1} + m_Color: {r: 0.1981132, g: 0.15915465, b: 0.103729084, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -47642,8 +47559,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: -150} - m_SizeDelta: {x: 714.3, y: 111.3} + m_AnchoredPosition: {x: 97.2, y: -90} + m_SizeDelta: {x: 769.9, y: 111.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6803065372500380724 CanvasRenderer: @@ -47666,7 +47583,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.063396946, b: 0.02352941, a: 1} + m_Color: {r: 1, g: 0.79670143, b: 0.514151, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -47675,7 +47592,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 45 + m_FontSize: 37 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -47686,7 +47603,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u795E\u738B\u7BC7\u4EE5\u5F00\u542F \n " + m_Text: "\u73B0\u91D1\u70B9\u5238\u6BCF\u65E50\u70B9\u6E05\u7A7A\uFF0C\u8BF7\u5404\u4F4D\u9053\u53CB\u6CE8\u610F\u4F7F\u7528\uFF01" --- !u!114 &6887651500131416486 MonoBehaviour: m_ObjectHideFlags: 0 @@ -47699,7 +47616,7 @@ MonoBehaviour: m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_EffectColor: {r: 0.4716981, g: 0.20786972, b: 0, a: 0.5} + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} m_EffectDistance: {x: 0.1, y: -0.1} m_UseGraphicAlpha: 1 --- !u!1 &6034053377817161175 @@ -86087,8 +86004,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: -5, y: 150} - m_SizeDelta: {x: 1082, y: 1440} + m_AnchoredPosition: {x: 0, y: 56} + m_SizeDelta: {x: 800, y: 673.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1286155026028855561 CanvasRenderer: @@ -86118,8 +86035,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 572eeaee48425774dab1b61e3ec6fdf1, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: e3d74104c05f1f440bb6e8dc3261e66c, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -95609,7 +95526,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 5960610963268629625} + - {fileID: 6510416734172376154} - {fileID: 2602860375024087904} - {fileID: 3473045224874218767} m_Father: {fileID: 7295495352958301589} @@ -95639,6 +95556,7 @@ GameObject: - component: {fileID: 6421447504836692245} - component: {fileID: 6393696512000285595} - component: {fileID: 1091912079401496814} + - component: {fileID: 1501382183561007282} m_Layer: 5 m_Name: title m_TagString: Untagged @@ -95664,7 +95582,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: 274} + m_AnchoredPosition: {x: -81, y: 207} m_SizeDelta: {x: 589, y: 187} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6393696512000285595 @@ -95688,7 +95606,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.990566, g: 0.9856291, b: 0.97654855, a: 1} + m_Color: {r: 0.9528302, g: 0.914426, b: 0.0764062, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -95697,18 +95615,33 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 100 + m_FontSize: 80 m_FontStyle: 2 m_BestFit: 0 m_MinSize: 1 - m_MaxSize: 120 - m_Alignment: 4 + m_MaxSize: 130 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u6BCF\u65E5\u73B0\u91D1\u70B9\u5238\u653E\u9001" + m_Text: "\u73B0\u91D1\u70B9\u5238\u5927\u653E\u9001" +--- !u!114 &1501382183561007282 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9107232928771547668} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &9213281909086535020 GameObject: m_ObjectHideFlags: 0 @@ -95755,3 +95688,138 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9213281909086535020} m_CullTransparentMesh: 0 +--- !u!1001 &8459674286078081761 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 876377584539813863} + m_Modifications: + - target: {fileID: 4040402500520929852, guid: caa674551693c3c43937202ed26254b6, + type: 3} + propertyPath: m_Name + value: live2d_c_swk_00015_s1 + objectReference: {fileID: 0} + - target: {fileID: 3404555805505803963, guid: caa674551693c3c43937202ed26254b6, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3404555805505803963, guid: caa674551693c3c43937202ed26254b6, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3404555805505803963, guid: caa674551693c3c43937202ed26254b6, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3404555805505803963, guid: caa674551693c3c43937202ed26254b6, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3404555805505803963, guid: caa674551693c3c43937202ed26254b6, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3404555805505803963, guid: caa674551693c3c43937202ed26254b6, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3404555805505803963, guid: caa674551693c3c43937202ed26254b6, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3404555805505803963, guid: caa674551693c3c43937202ed26254b6, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3404555805505803963, guid: caa674551693c3c43937202ed26254b6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3404555805505803963, guid: caa674551693c3c43937202ed26254b6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3404555805505803963, guid: caa674551693c3c43937202ed26254b6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3404555805505803963, guid: caa674551693c3c43937202ed26254b6, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3404555805505803963, guid: caa674551693c3c43937202ed26254b6, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -262 + objectReference: {fileID: 0} + - target: {fileID: 3404555805505803963, guid: caa674551693c3c43937202ed26254b6, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3404555805505803963, guid: caa674551693c3c43937202ed26254b6, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3404555805505803963, guid: caa674551693c3c43937202ed26254b6, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3404555805505803963, guid: caa674551693c3c43937202ed26254b6, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3404555805505803963, guid: caa674551693c3c43937202ed26254b6, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3404555805505803963, guid: caa674551693c3c43937202ed26254b6, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3404555805505803963, guid: caa674551693c3c43937202ed26254b6, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3404555805505803963, guid: caa674551693c3c43937202ed26254b6, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3404555805505803963, guid: caa674551693c3c43937202ed26254b6, + type: 3} + propertyPath: m_LocalScale.x + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 3404555805505803963, guid: caa674551693c3c43937202ed26254b6, + type: 3} + propertyPath: m_LocalScale.y + value: 0.7 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: caa674551693c3c43937202ed26254b6, type: 3} +--- !u!224 &6510416734172376154 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3404555805505803963, guid: caa674551693c3c43937202ed26254b6, + type: 3} + m_PrefabInstance: {fileID: 8459674286078081761} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/GMTianTianXJQ.lua b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/GMTianTianXJQ.lua index e4d8474f36..cc6c585b94 100644 --- a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/GMTianTianXJQ.lua +++ b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/GMTianTianXJQ.lua @@ -69,7 +69,7 @@ function GMTianTianXJQ:OnSortingOrderChange() cursortingOrder = self.sortingOrder end function GMTianTianXJQ:OnShow() - self.title.text = "每日现金点券放送" + self.title.text = "现金点券大放送" self:RefreshPanel() end