diff --git a/GameMain/UI/UISprites/Other/Packed/Sp1/book_item_bg_arror.png b/GameMain/UI/UISprites/Other/Packed/Sp1/book_item_bg_arror.png deleted file mode 100644 index 66709136..00000000 Binary files a/GameMain/UI/UISprites/Other/Packed/Sp1/book_item_bg_arror.png and /dev/null differ diff --git a/GameMain/UI/UISprites/Other/Packed/Sp1/book_item_bg_arror_yellow.png b/GameMain/UI/UISprites/Other/Packed/Sp1/book_item_bg_arror_yellow.png deleted file mode 100644 index f415a5ff..00000000 Binary files a/GameMain/UI/UISprites/Other/Packed/Sp1/book_item_bg_arror_yellow.png and /dev/null differ diff --git a/yyzl/04Illustratedbook/BookColorItem.prefab b/yyzl/04Illustratedbook/BookColorItem.prefab index 4abb4c47..d1e73adf 100644 --- a/yyzl/04Illustratedbook/BookColorItem.prefab +++ b/yyzl/04Illustratedbook/BookColorItem.prefab @@ -285,8 +285,8 @@ MonoBehaviour: m_ChildAlignment: 6 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 156, y: 140} - m_Spacing: {x: 30, y: 30} + m_CellSize: {x: 145, y: 140} + m_Spacing: {x: 40, y: 30} m_Constraint: 0 m_ConstraintCount: 2 --- !u!1 &3628624918976230198 diff --git a/yyzl/04Illustratedbook/BookGroupItem.prefab b/yyzl/04Illustratedbook/BookGroupItem.prefab index ae05fcb7..bd81741f 100644 --- a/yyzl/04Illustratedbook/BookGroupItem.prefab +++ b/yyzl/04Illustratedbook/BookGroupItem.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &908490034777572092 +--- !u!1 &1467820751792344901 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,56 +8,56 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2537923337602637357} - - component: {fileID: 7847441054791428301} - - component: {fileID: 3884908211258137609} - m_Layer: 0 - m_Name: find_sg + - component: {fileID: 2708020436204743716} + - component: {fileID: 889863099361644952} + - component: {fileID: 7948685574131665916} + m_Layer: 5 + m_Name: bg m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &2537923337602637357 + m_IsActive: 1 +--- !u!224 &2708020436204743716 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 908490034777572092} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 1467820751792344901} + 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: 4247888276719293258} + m_Father: {fileID: 2822931232352417038} 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_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!222 &7847441054791428301 +--- !u!222 &889863099361644952 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 908490034777572092} - m_CullTransparentMesh: 1 ---- !u!114 &3884908211258137609 + m_GameObject: {fileID: 1467820751792344901} + m_CullTransparentMesh: 0 +--- !u!114 &7948685574131665916 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 908490034777572092} + m_GameObject: {fileID: 1467820751792344901} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 6c284c00cc81fe74db957ba76d15a4a7, type: 2} + m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -65,32 +65,16 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - skeletonDataAsset: {fileID: 11400000, guid: 926c7c3503c84b04fbf6e909ed7c088c, type: 2} - initialSkinName: - initialFlipX: 0 - initialFlipY: 0 - startingAnimation: EFF_MERGE_Find - startingLoop: 0 - timeScale: 1 - freeze: 0 - updateWhenInvisible: 3 - unscaledTime: 0 - allowMultipleCanvasRenderers: 0 - canvasRenderers: [] - separatorSlotNames: [] - enableSeparatorSlots: 0 - separatorParts: [] - updateSeparatorPartLocation: 1 - meshGenerator: - settings: - useClipping: 1 - zSpacing: 0 - pmaVertexColors: 1 - tintBlack: 0 - canvasGroupTintBlack: 0 - calculateTangents: 0 - addNormals: 0 - immutableTriangles: 0 + m_Sprite: {fileID: 21300000, guid: c74ac9b37c886f7468a793e49c162d95, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &1565200090863992595 GameObject: m_ObjectHideFlags: 0 @@ -163,6 +147,81 @@ MonoBehaviour: y: 0 width: 1 height: 1 +--- !u!1 &1785292650906014515 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3449474179109204229} + - component: {fileID: 1419178963571049990} + - component: {fileID: 670371236574526356} + m_Layer: 5 + m_Name: cover + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3449474179109204229 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1785292650906014515} + 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: 2822931232352417038} + 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!222 &1419178963571049990 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1785292650906014515} + m_CullTransparentMesh: 0 +--- !u!114 &670371236574526356 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1785292650906014515} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 7dd8c95fc0555b04797a9064b6e8e456, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &3088128347667481232 GameObject: m_ObjectHideFlags: 0 @@ -625,6 +684,51 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5832522565398078194 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5412225681051340086} + - component: {fileID: 7800898936764007231} + m_Layer: 5 + m_Name: container + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5412225681051340086 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5832522565398078194} + 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: 3330924301500401845} + m_Father: {fileID: 2822931232352417038} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.03, y: 0.03} + m_AnchorMax: {x: 0.97, y: 0.97} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7800898936764007231 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5832522565398078194} + m_CullTransparentMesh: 1 --- !u!1 &6432497883841972835 GameObject: m_ObjectHideFlags: 0 @@ -859,6 +963,81 @@ MonoBehaviour: IsSqueezeDown: 0 IsEffectOperate: 1 BindGos: [] +--- !u!1 &6782116530409705910 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2404093502498253379} + - component: {fileID: 7147479627141502364} + - component: {fileID: 224777167691627777} + m_Layer: 5 + m_Name: fillHandlerEnd + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2404093502498253379 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6782116530409705910} + 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: 228416033914031936} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.445, y: 0} + m_AnchorMax: {x: 0.555, y: 0.11} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7147479627141502364 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6782116530409705910} + m_CullTransparentMesh: 0 +--- !u!114 &224777167691627777 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6782116530409705910} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.08235294, g: 0.92941177, b: 0.08235294, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: a9037e1e42707a5468c772c9d8cdcc48, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &7108073851556908471 GameObject: m_ObjectHideFlags: 0 @@ -931,7 +1110,7 @@ MonoBehaviour: y: 0 width: 1 height: 1 ---- !u!1 &7624920601730509904 +--- !u!1 &7216378907699667964 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -939,73 +1118,43 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1186859172698286376} - - component: {fileID: 8930300065841019225} - - component: {fileID: 1019081945636530276} + - component: {fileID: 228416033914031936} + - component: {fileID: 2749661074720600736} m_Layer: 5 - m_Name: jindu + m_Name: container_static m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1186859172698286376 +--- !u!224 &228416033914031936 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7624920601730509904} + m_GameObject: {fileID: 7216378907699667964} 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: 4247888276719293258} + m_Children: + - {fileID: 2404093502498253379} + m_Father: {fileID: 2822931232352417038} 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: 1.8} - m_SizeDelta: {x: 172, y: 172} + m_AnchorMin: {x: 0.03, y: 0.03} + m_AnchorMax: {x: 0.97, y: 0.97} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8930300065841019225 +--- !u!222 &2749661074720600736 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7624920601730509904} + m_GameObject: {fileID: 7216378907699667964} m_CullTransparentMesh: 1 ---- !u!114 &1019081945636530276 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7624920601730509904} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a8eb81db829710d4988ff2c8ca32af11, type: 3} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 0 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &7983019862351797772 GameObject: m_ObjectHideFlags: 0 @@ -1016,7 +1165,6 @@ GameObject: m_Component: - component: {fileID: 4247888276719293258} - component: {fileID: 4294161302049889660} - - component: {fileID: 8290266941370033595} m_Layer: 5 m_Name: rewardS m_TagString: Untagged @@ -1036,11 +1184,10 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1186859172698286376} + - {fileID: 2822931232352417038} - {fileID: 2460401683233485617} - {fileID: 8169900112686875496} - {fileID: 6578875244155950334} - - {fileID: 2537923337602637357} - {fileID: 5996048396827987527} m_Father: {fileID: 5254280633039243211} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1057,27 +1204,72 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7983019862351797772} m_CullTransparentMesh: 1 ---- !u!114 &8290266941370033595 +--- !u!1 &8101133763796512845 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3330924301500401845} + - component: {fileID: 5883349346395193241} + - component: {fileID: 1496468996986500069} + m_Layer: 5 + m_Name: fillHandlerStart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3330924301500401845 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8101133763796512845} + 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: 5412225681051340086} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.445, y: 0} + m_AnchorMax: {x: 0.555, y: 0.11} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5883349346395193241 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8101133763796512845} + m_CullTransparentMesh: 0 +--- !u!114 &1496468996986500069 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7983019862351797772} + m_GameObject: {fileID: 8101133763796512845} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.08235294, g: 0.92941177, b: 0.08235294, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ff6a96ef3002ec74bb6ec8b00acf4312, type: 3} + m_Sprite: {fileID: 21300000, guid: a9037e1e42707a5468c772c9d8cdcc48, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1087,3 +1279,134 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8644416747175508603 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 671246265614487334} + - component: {fileID: 110011973134423184} + - component: {fileID: 5978654007409658645} + m_Layer: 5 + m_Name: circleFillArea + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &671246265614487334 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8644416747175508603} + 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: 2822931232352417038} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.03, y: 0.03} + m_AnchorMax: {x: 0.97, y: 0.97} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &110011973134423184 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8644416747175508603} + m_CullTransparentMesh: 0 +--- !u!114 &5978654007409658645 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8644416747175508603} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.08235294, g: 0.92941177, b: 0.08235294, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: a9037e1e42707a5468c772c9d8cdcc48, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 0 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &9190398931087433467 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2822931232352417038} + - component: {fileID: 2713058273222685214} + m_Layer: 5 + m_Name: CircleFill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2822931232352417038 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9190398931087433467} + 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: 2708020436204743716} + - {fileID: 671246265614487334} + - {fileID: 5412225681051340086} + - {fileID: 228416033914031936} + - {fileID: 3449474179109204229} + m_Father: {fileID: 4247888276719293258} + 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: 188, y: 188} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2713058273222685214 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9190398931087433467} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c0618ff927c276e42a792edd5ecf305f, type: 3} + m_Name: + m_EditorClassIdentifier: + fillValue: 0 + circleFillImage: {fileID: 5978654007409658645} + fillHandler: {fileID: 5412225681051340086} diff --git a/yyzl/04Illustratedbook/BookItem.prefab b/yyzl/04Illustratedbook/BookItem.prefab index d958c7ca..43d6043c 100644 --- a/yyzl/04Illustratedbook/BookItem.prefab +++ b/yyzl/04Illustratedbook/BookItem.prefab @@ -34,7 +34,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: -10, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 45, y: 71} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6871865930457009805 @@ -109,7 +109,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: 78, y: 0} + m_AnchoredPosition: {x: 76, y: 0} m_SizeDelta: {x: 19, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2316200921152039901 @@ -140,7 +140,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e9cf039c8b5f11247986da8c2700b7db, type: 3} + m_Sprite: {fileID: 21300000, guid: 9c704b1dc1530f84db07d16f9152b215, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -184,7 +184,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: -2} + m_AnchoredPosition: {x: 7, y: -2} m_SizeDelta: {x: 180, y: 160} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1727342855388348491 @@ -259,7 +259,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: -7, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 164, y: 164} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &595577931506045733 @@ -365,7 +365,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8dbd96b1620226b4a836565858e240a1, type: 3} + m_Sprite: {fileID: 21300000, guid: 89b880c5fa09e6c47aed8ce6b6d819b5, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -411,7 +411,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: -10, y: -74.5} + m_AnchoredPosition: {x: 0, y: -74.5} m_SizeDelta: {x: 156, y: 169} m_Pivot: {x: 0.5, y: 0} --- !u!222 &8033445966256436850 @@ -546,7 +546,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -10, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8033445967511458080 @@ -628,7 +628,7 @@ RectTransform: 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: 156, y: 140} + m_SizeDelta: {x: 145, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8033445967542242044 CanvasRenderer: @@ -705,7 +705,7 @@ RectTransform: 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: 157, y: 140} + m_SizeDelta: {x: 145, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8033445967631505479 CanvasRenderer: diff --git a/yyzl/Common/Small/collect_pic_back.png b/yyzl/Common/Small/collect_pic_back.png index 75c14cd0..6d01829d 100644 Binary files a/yyzl/Common/Small/collect_pic_back.png and b/yyzl/Common/Small/collect_pic_back.png differ diff --git a/yyzl/Common/Small/collect_pic_back.png.meta b/yyzl/Common/Small/collect_pic_back.png.meta index a544cb33..f843c88b 100644 --- a/yyzl/Common/Small/collect_pic_back.png.meta +++ b/yyzl/Common/Small/collect_pic_back.png.meta @@ -49,7 +49,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 33, y: 0, z: 47, w: 0} + spriteBorder: {x: 27, y: 28, z: 27, w: 28} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/yyzl/Common/Small/collect_pic_back_jt.png b/yyzl/Common/Small/collect_pic_back_jt.png new file mode 100644 index 00000000..656c0517 Binary files /dev/null and b/yyzl/Common/Small/collect_pic_back_jt.png differ diff --git a/GameMain/UI/UISprites/Other/Packed/Sp1/book_item_bg_arror.png.meta b/yyzl/Common/Small/collect_pic_back_jt.png.meta similarity index 97% rename from GameMain/UI/UISprites/Other/Packed/Sp1/book_item_bg_arror.png.meta rename to yyzl/Common/Small/collect_pic_back_jt.png.meta index df32aeac..515117a8 100644 --- a/GameMain/UI/UISprites/Other/Packed/Sp1/book_item_bg_arror.png.meta +++ b/yyzl/Common/Small/collect_pic_back_jt.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8dbd96b1620226b4a836565858e240a1 +guid: 89b880c5fa09e6c47aed8ce6b6d819b5 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -97,12 +97,12 @@ TextureImporter: buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 48 + textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 1 + overridden: 0 ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 diff --git a/yyzl/Common/Small/collect_pic_giftback.png b/yyzl/Common/Small/collect_pic_giftback.png index 879b56bb..95eb1e16 100644 Binary files a/yyzl/Common/Small/collect_pic_giftback.png and b/yyzl/Common/Small/collect_pic_giftback.png differ diff --git a/yyzl/Common/Small/collect_pic_giftback.png.meta b/yyzl/Common/Small/collect_pic_giftback.png.meta index 3ee0e58e..1a946984 100644 --- a/yyzl/Common/Small/collect_pic_giftback.png.meta +++ b/yyzl/Common/Small/collect_pic_giftback.png.meta @@ -49,7 +49,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 32, y: 0, z: 53, w: 0} + spriteBorder: {x: 27, y: 28, z: 27, w: 28} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/yyzl/Common/Small/collect_pic_giftback_jt.png b/yyzl/Common/Small/collect_pic_giftback_jt.png new file mode 100644 index 00000000..50b95268 Binary files /dev/null and b/yyzl/Common/Small/collect_pic_giftback_jt.png differ diff --git a/GameMain/UI/UISprites/Other/Packed/Sp1/book_item_bg_arror_yellow.png.meta b/yyzl/Common/Small/collect_pic_giftback_jt.png.meta similarity index 97% rename from GameMain/UI/UISprites/Other/Packed/Sp1/book_item_bg_arror_yellow.png.meta rename to yyzl/Common/Small/collect_pic_giftback_jt.png.meta index df87bd98..6ea4b479 100644 --- a/GameMain/UI/UISprites/Other/Packed/Sp1/book_item_bg_arror_yellow.png.meta +++ b/yyzl/Common/Small/collect_pic_giftback_jt.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e9cf039c8b5f11247986da8c2700b7db +guid: 9c704b1dc1530f84db07d16f9152b215 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -97,12 +97,12 @@ TextureImporter: buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 48 + textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 1 + overridden: 0 ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0