diff --git a/Assets/MyGame/Scripts/Items/Bullits/BullitMove.cs b/Assets/MyGame/Scripts/Items/Bullits/BullitMove.cs index 36d6e60ec..00ea890ee 100644 --- a/Assets/MyGame/Scripts/Items/Bullits/BullitMove.cs +++ b/Assets/MyGame/Scripts/Items/Bullits/BullitMove.cs @@ -25,7 +25,7 @@ public class BullitMove : MonoBehaviour public float maxTurnSpeed = 15f; // 最大转向速度（度/秒） public float minTurnSpeed = 2f; // 最小转向速度 public float distanceForMaxTurn = 1f; // 在此距离内达到最大转向速度 - public float hitDistance = 0.5f; // 命中判定距离 + float hitDistance = 2f; // 命中判定距离 void Awake() { diff --git a/Assets/MyGame/Scripts/Net/APIRequestList_Login.cs b/Assets/MyGame/Scripts/Net/APIRequestList_Login.cs index 9813c60f8..5f116f8dc 100644 --- a/Assets/MyGame/Scripts/Net/APIRequestList_Login.cs +++ b/Assets/MyGame/Scripts/Net/APIRequestList_Login.cs @@ -87,6 +87,7 @@ res => { APIManager.Response(APIType.Login_Register, req, obj => { + GameManager.Instance.user = obj; callback?.Invoke(obj); }); } diff --git a/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/ReliefConfig.cs b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/ReliefConfig.cs index 5e785e303..001f15550 100644 --- a/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/ReliefConfig.cs +++ b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/ReliefConfig.cs @@ -16,7 +16,7 @@ namespace Assets.MyGame.Scripts.Net.API.GameConfig_SubClass /// /// 金币数量 /// - public int gold; + public long gold; /// /// 每天可领取次数 diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/JL/fish_136.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/JL/fish_136.prefab index bc427d02d..7bf3e234b 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/JL/fish_136.prefab +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/JL/fish_136.prefab @@ -930,7 +930,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1361653457580592, guid: 055ba0a273a3d0c48a43f4fb3f92dc4d, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1361653457580592, guid: 055ba0a273a3d0c48a43f4fb3f92dc4d, type: 3} propertyPath: m_TagString diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/QL/fish_144.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/QL/fish_144.prefab index 5e09223da..1f8761331 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/QL/fish_144.prefab +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/QL/fish_144.prefab @@ -7401,12 +7401,84 @@ Animator: type: 3} m_PrefabInstance: {fileID: 98071442387624804} m_PrefabAsset: {fileID: 0} +--- !u!4 &93477760682605764 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4629983905275808, guid: d82e692e41cc85e4e86f6899f58f771d, + type: 3} + m_PrefabInstance: {fileID: 98071442387624804} + m_PrefabAsset: {fileID: 0} +--- !u!4 &93594333527686029 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4759759613319401, guid: d82e692e41cc85e4e86f6899f58f771d, + type: 3} + m_PrefabInstance: {fileID: 98071442387624804} + m_PrefabAsset: {fileID: 0} +--- !u!4 &93690243323115922 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4698980477721334, guid: d82e692e41cc85e4e86f6899f58f771d, + type: 3} + m_PrefabInstance: {fileID: 98071442387624804} + m_PrefabAsset: {fileID: 0} +--- !u!4 &93717950943853939 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4671343216434711, guid: d82e692e41cc85e4e86f6899f58f771d, + type: 3} + m_PrefabInstance: {fileID: 98071442387624804} + m_PrefabAsset: {fileID: 0} --- !u!4 &93793445555571887 stripped Transform: m_CorrespondingSourceObject: {fileID: 4877232833458123, guid: d82e692e41cc85e4e86f6899f58f771d, type: 3} m_PrefabInstance: {fileID: 98071442387624804} m_PrefabAsset: {fileID: 0} +--- !u!4 &93946421411710175 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4970551864321979, guid: d82e692e41cc85e4e86f6899f58f771d, + type: 3} + m_PrefabInstance: {fileID: 98071442387624804} + m_PrefabAsset: {fileID: 0} +--- !u!4 &93953834579062702 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4963155914591434, guid: d82e692e41cc85e4e86f6899f58f771d, + type: 3} + m_PrefabInstance: {fileID: 98071442387624804} + m_PrefabAsset: {fileID: 0} +--- !u!4 &95139269106097999 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4059243608914987, guid: d82e692e41cc85e4e86f6899f58f771d, + type: 3} + m_PrefabInstance: {fileID: 98071442387624804} + m_PrefabAsset: {fileID: 0} +--- !u!4 &95306507299905282 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4208614805552230, guid: d82e692e41cc85e4e86f6899f58f771d, + type: 3} + m_PrefabInstance: {fileID: 98071442387624804} + m_PrefabAsset: {fileID: 0} +--- !u!4 &95425877480302237 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4343214669039097, guid: d82e692e41cc85e4e86f6899f58f771d, + type: 3} + m_PrefabInstance: {fileID: 98071442387624804} + m_PrefabAsset: {fileID: 0} +--- !u!4 &95556410863597272 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4247935987930556, guid: d82e692e41cc85e4e86f6899f58f771d, + type: 3} + m_PrefabInstance: {fileID: 98071442387624804} + m_PrefabAsset: {fileID: 0} +--- !u!4 &95617135902232187 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4459835084729631, guid: d82e692e41cc85e4e86f6899f58f771d, + type: 3} + m_PrefabInstance: {fileID: 98071442387624804} + m_PrefabAsset: {fileID: 0} +--- !u!1 &97162546455774594 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1508148588832486, guid: d82e692e41cc85e4e86f6899f58f771d, + type: 3} + m_PrefabInstance: {fileID: 98071442387624804} + m_PrefabAsset: {fileID: 0} --- !u!1 &97318211613593590 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1641643194739858, guid: d82e692e41cc85e4e86f6899f58f771d, @@ -7453,9 +7525,20 @@ MonoBehaviour: moveTime: 0 isyz: 0 yzID: - colliderList: [] + colliderList: + - {fileID: 95425877480302237} + - {fileID: 93953834579062702} + - {fileID: 93717950943853939} + - {fileID: 95556410863597272} + - {fileID: 93690243323115922} + - {fileID: 95306507299905282} + - {fileID: 93946421411710175} + - {fileID: 95617135902232187} + - {fileID: 93594333527686029} + - {fileID: 93477760682605764} + - {fileID: 95139269106097999} lockPoint: {fileID: 93793445555571887} - bingDongEffect: {fileID: 0} + bingDongEffect: {fileID: 97162546455774594} rotationPY: 60 isRotate: 0 isNot1: 0 diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/6004@skin.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/6004@skin.prefab index 81f86c8c2..603d764c2 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/6004@skin.prefab +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/6004@skin.prefab @@ -42,7 +42,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1025387898001180, guid: d949c78be195fa54486f6a9ab25764bb, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1025387898001180, guid: d949c78be195fa54486f6a9ab25764bb, type: 3} propertyPath: m_TagString diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/6005.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/6005.prefab index 8d58d7c6a..d6a16fdf6 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/6005.prefab +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/6005.prefab @@ -444,7 +444,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1180172148385199, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1180172148385199, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} propertyPath: m_TagString diff --git a/Assets/MyGame/aa/UI/DefaultPanel/GGL.prefab b/Assets/MyGame/aa/UI/DefaultPanel/GGL.prefab new file mode 100644 index 000000000..cf693960a --- /dev/null +++ b/Assets/MyGame/aa/UI/DefaultPanel/GGL.prefab @@ -0,0 +1,749 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &312577455046874505 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6533238405127315498} + - component: {fileID: 3859626517462474744} + - component: {fileID: 6696627446588658793} + m_Layer: 0 + m_Name: gk_jbz + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6533238405127315498 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 312577455046874505} + 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: 6741189298658464872} + 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: 32.49998, y: 67} + m_SizeDelta: {x: 103, y: 38} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3859626517462474744 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 312577455046874505} + m_CullTransparentMesh: 1 +--- !u!114 &6696627446588658793 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 312577455046874505} + 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: f0c207cdaefb27d499d61d8ed627f440, 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 &542165902000873108 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5459618646650965046} + - component: {fileID: 3225175826026018977} + - component: {fileID: 1182454637597247869} + m_Layer: 0 + m_Name: gk_jbk + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5459618646650965046 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 542165902000873108} + 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: 6741189298658464872} + 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: 34.999992, y: -58} + m_SizeDelta: {x: 382, y: 144} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3225175826026018977 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 542165902000873108} + m_CullTransparentMesh: 1 +--- !u!114 &1182454637597247869 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 542165902000873108} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 2800000, guid: 979eebfff6074f94998fdc2a7b10eaef, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!1 &3670369079429744160 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3978305931316247571} + - component: {fileID: 8027089402435724610} + - component: {fileID: 2708368166668710266} + m_Layer: 0 + m_Name: icon_jinbi + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3978305931316247571 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3670369079429744160} + 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: 6741189298658464872} + 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: 31.500006, y: -49.000015} + m_SizeDelta: {x: 85, y: 64} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8027089402435724610 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3670369079429744160} + m_CullTransparentMesh: 1 +--- !u!114 &2708368166668710266 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3670369079429744160} + 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: f913511fd7e863d45ac93b62c7fd4354, 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 &4574797855844090161 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5277753812324776221} + - component: {fileID: 8296661565039094048} + - component: {fileID: 9123422922308943981} + m_Layer: 0 + m_Name: "3000\u4E07" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5277753812324776221 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4574797855844090161} + 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: 6741189298658464872} + 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: 32.49998, y: -92.000015} + m_SizeDelta: {x: 57, y: 16} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8296661565039094048 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4574797855844090161} + m_CullTransparentMesh: 1 +--- !u!114 &9123422922308943981 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4574797855844090161} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "3000\u4E07" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2} + m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4288208877 + m_fontColor: {r: 0.9294118, g: 0.8745099, b: 0.59607846, a: 1} + m_enableVertexGradient: 0 + 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} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 17.8 + m_fontSizeBase: 17.8 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &6990213384920872632 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7439266752316284041} + - component: {fileID: 3570568180230689320} + - component: {fileID: 1688027432723618225} + - component: {fileID: 382501551969697700} + m_Layer: 0 + m_Name: BY_PlaneInfoPanel_002 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7439266752316284041 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6990213384920872632} + 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: 6741189298658464872} + 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: 344, y: 220.5} + m_SizeDelta: {x: 68, y: 65} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3570568180230689320 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6990213384920872632} + m_CullTransparentMesh: 1 +--- !u!114 &1688027432723618225 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6990213384920872632} + 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: 860ec06da67b4d24b813e8c6eeeba562, 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!114 &382501551969697700 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6990213384920872632} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1688027432723618225} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &7386276912910179018 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6741189298658464872} + - component: {fileID: 775516278006549546} + - component: {fileID: 7630064463621848600} + - component: {fileID: 2143291493192206090} + m_Layer: 0 + m_Name: GGL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6741189298658464872 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7386276912910179018} + 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: 7116278479721089516} + - {fileID: 7670511784676059837} + - {fileID: 3978305931316247571} + - {fileID: 5277753812324776221} + - {fileID: 6533238405127315498} + - {fileID: 5459618646650965046} + - {fileID: 7439266752316284041} + m_Father: {fileID: 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: 828, y: 576} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &775516278006549546 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7386276912910179018} + m_CullTransparentMesh: 1 +--- !u!114 &7630064463621848600 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7386276912910179018} + 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: cf02a39539eaf9a4288c66d3c22d1980, 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!114 &2143291493192206090 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7386276912910179018} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0a0dad83abe7024ba27b388d2ade860, type: 3} + m_Name: + m_EditorClassIdentifier: + btn_Close: {fileID: 382501551969697700} + uIEffect: 1 + scratchImage: {fileID: 1182454637597247869} + tmp_AwardName: {fileID: 9123422922308943981} + maskMat: {fileID: 2100000, guid: 16fb6fc82be36a540a74d11f90c0db6b, type: 2} + eraseMat: {fileID: 2100000, guid: 3261f5202cdff64409572045cc75834c, type: 2} + coatColor: {r: 0.7, g: 0.7, b: 0.7, a: 1} + brushSize: 0.116 + revealThreshold: 0.6 + autoReveal: 1 + awards: + - "\u8C22\u8C22\u53C2\u4E0E" + - "\u4E00\u7B49\u5956" + - "\u4E8C\u7B49\u5956" + - "\u4E09\u7B49\u5956" + - "\u518D\u6765\u4E00\u6B21" + awardWeights: + - 0.5 + - 0.05 + - 0.1 + - 0.15 + - 0.2 + onRevealed: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &8665341322349665900 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7116278479721089516} + - component: {fileID: 3020386938272183173} + - component: {fileID: 1805356176097018884} + m_Layer: 0 + m_Name: gk_bs + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7116278479721089516 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8665341322349665900} + 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: 6741189298658464872} + 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: 32.49998, y: -58} + m_SizeDelta: {x: 423, y: 162} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3020386938272183173 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8665341322349665900} + m_CullTransparentMesh: 1 +--- !u!114 &1805356176097018884 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8665341322349665900} + 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: 9900a9f79d8f40940aea21bfac3281bd, 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 &8956164347122915666 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7670511784676059837} + - component: {fileID: 5941135501919430999} + - component: {fileID: 94702547002827875} + m_Layer: 0 + m_Name: NZXL_New_zljl_bg19 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7670511784676059837 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8956164347122915666} + 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: 6741189298658464872} + 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: 31.500006, y: -58} + m_SizeDelta: {x: 101, y: 102} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5941135501919430999 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8956164347122915666} + m_CullTransparentMesh: 1 +--- !u!114 &94702547002827875 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8956164347122915666} + 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: 83bc201b0411b30428cb2fd52a3a5696, 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 diff --git a/Assets/MyGame/aa/UI/DefaultPanel/GGL.prefab.meta b/Assets/MyGame/aa/UI/DefaultPanel/GGL.prefab.meta new file mode 100644 index 000000000..36ba865a6 --- /dev/null +++ b/Assets/MyGame/aa/UI/DefaultPanel/GGL.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f11b7edd13b4a7c4fbe9ec65d48a1c4d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe.meta b/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe.meta new file mode 100644 index 000000000..8bbb0eba1 --- /dev/null +++ b/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 82a4096d68ca55a4faf0f658859ce4fa +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe/GuaGuaLeGPU.cs b/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe/GuaGuaLeGPU.cs new file mode 100644 index 000000000..b4bbfbea9 --- /dev/null +++ b/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe/GuaGuaLeGPU.cs @@ -0,0 +1,313 @@ +using TMPro; +using UnityEngine; +using UnityEngine.EventSystems; +using UnityEngine.UI; + +/// +/// GPU 刮刮乐（三层架构版） +/// +/// 层级结构： +/// RawImage (prizeImage) ← 最下层：奖品图 +/// Text (tmp_AwardName) ← 中间层：奖品文字 +/// RawImage (scratchImage) ← 最上层：涂层遮罩（挂本脚本） +/// +/// 原理： +/// 涂层遮罩用 ScratchMask.shader，遮罩 RT 全白 = 不透明(未刮)， +/// 全黑 = 透明(已刮)。刮擦通过 Graphics.Blit + ScratchErase.shader +/// 在 GPU 内完成，零 CPU 像素操作。 +/// +public class GuaGuaLeGPU : SubUIBase, IPointerDownHandler, IDragHandler +{ + [Header("UI 引用（必填）")] + public RawImage scratchImage; // 最上层：涂层遮罩（挂此脚本） + public TextMeshProUGUI tmp_AwardName; // 中间层：奖品文字 + + [Header("材质（模板）")] + public Material maskMat; // 使用 ScratchMask.shader（涂层遮罩） + public Material eraseMat; // 使用 ScratchErase.shader（擦除） + + [Header("涂层颜色")] + public Color coatColor = new Color(0.7f, 0.7f, 0.7f, 1f); + + [Header("笔刷")] + [Range(0.01f, 0.3f)] public float brushSize = 0.06f; + + [Header("自动揭示")] + [Range(0f, 1f)] public float revealThreshold = 0.6f; + public bool autoReveal = true; + + [Header("奖品配置")] + public string[] awards = { "谢谢参与", "一等奖", "二等奖", "三等奖", "再来一次" }; + public float[] awardWeights = { 0.50f, 0.05f, 0.10f, 0.15f, 0.20f }; + + [Header("事件")] + public UnityEngine.Events.UnityEvent onRevealed; + + // ---- 运行时 ---- + private RenderTexture maskRT; + private Material instanceMaskMat; // 涂层遮罩材质实例 + private Material instanceEraseMat; // 擦除材质实例 + private int rtWidth = 512; + private int rtHeight = 512; + + private string currentAward; + private bool isRevealed; + private bool isScratching; + + private Vector2 lastUV; + private bool hasLastUV; + + private Texture2D progressReadTex; + private int dragCount; + + private void Start() + { + if (scratchImage == null) { Debug.LogError("[GPU] scratchImage 为空！"); return; } + if (maskMat == null) { Debug.LogError("[GPU] maskMat 为空！"); return; } + if (eraseMat == null) { Debug.LogError("[GPU] eraseMat 为空！"); return; } + + if (awardWeights == null || awardWeights.Length != awards.Length) + { + awardWeights = new float[awards.Length]; + float w = 1f / Mathf.Max(1, awards.Length); + for (int i = 0; i < awardWeights.Length; i++) awardWeights[i] = w; + } + + InitCard(); + } + + private void InitCard() + { + // 1. 遮罩 RT（全白 = 未刮，不透明） + maskRT = new RenderTexture(rtWidth, rtHeight, 0, RenderTextureFormat.ARGB32) + { + filterMode = FilterMode.Bilinear + }; + maskRT.Create(); + ClearRT(maskRT, Color.white); + + + + // 3. 最上层：涂层遮罩材质（实例化，避免 UGUI 材质共享问题） + instanceMaskMat = new Material(maskMat); + instanceMaskMat.SetTexture("_MaskTex", maskRT); + instanceMaskMat.SetColor("_CoatColor", coatColor); + + scratchImage.material = instanceMaskMat; + scratchImage.texture = null; + + // 4. 擦除材质实例 + instanceEraseMat = new Material(eraseMat); + instanceEraseMat.SetFloat("_BrushSize", brushSize); + + // 5. 摇奖 + currentAward = RollAward(); + if (tmp_AwardName != null) + tmp_AwardName.text = currentAward; + + // 6. 进度读取用纹理 + progressReadTex = new Texture2D(rtWidth, rtHeight, TextureFormat.ARGB32, false); + + ResetState(); + Debug.Log($"[GPU] 初始化完成 {rtWidth}x{rtHeight}"); + } + + private void ResetState() + { + isRevealed = false; + isScratching = false; + hasLastUV = false; + dragCount = 0; + } + + // ================================================================ + // 公开方法 + // ================================================================ + + public void ResetCard() + { + if (maskRT == null) return; + + ClearRT(maskRT, Color.white); + ResetState(); + + currentAward = RollAward(); + if (tmp_AwardName != null) + tmp_AwardName.text = currentAward; + + if (instanceMaskMat != null) + instanceMaskMat.SetColor("_CoatColor", coatColor); + } + + public void RevealAll() + { + if (maskRT == null || isRevealed) return; + isRevealed = true; + + ClearRT(maskRT, Color.black); + + if (tmp_AwardName != null) + tmp_AwardName.text = currentAward; + onRevealed?.Invoke(); + } + + // ================================================================ + // 输入处理 + // ================================================================ + + public void OnPointerDown(PointerEventData e) + { + if (isRevealed) return; + isScratching = true; + + if (UVFromPointer(e, out var uv)) + { + ScratchAt(uv); + lastUV = uv; + hasLastUV = true; + } + TryAutoReveal(); + } + + public void OnDrag(PointerEventData e) + { + if (isRevealed || !isScratching) return; + if (!UVFromPointer(e, out var uv)) return; + + if (hasLastUV) + { + float dist = Vector2.Distance(uv, lastUV); + int steps = Mathf.Max(1, Mathf.CeilToInt(dist / (brushSize * 0.4f))); + for (int i = 1; i <= steps; i++) + { + float t = (float)i / steps; + var p = Vector2.Lerp(lastUV, uv, t); + ScratchAt(p); + } + } + else + { + ScratchAt(uv); + } + + lastUV = uv; + hasLastUV = true; + + if (++dragCount % 10 == 0) + TryAutoReveal(); + } + + private void OnDisable() + { + isScratching = false; + hasLastUV = false; + } + + // ================================================================ + // 核心擦除（GPU） + // ================================================================ + + private void ScratchAt(Vector2 uv) + { + instanceEraseMat.SetVector("_BrushPos", new Vector4(uv.x, uv.y, 0, 0)); + + var temp = RenderTexture.GetTemporary(rtWidth, rtHeight, 0, RenderTextureFormat.ARGB32); + Graphics.Blit(maskRT, temp, instanceEraseMat); + Graphics.Blit(temp, maskRT); + RenderTexture.ReleaseTemporary(temp); + } + + // ================================================================ + // 进度检测 + // ================================================================ + + private void TryAutoReveal() + { + if (isRevealed || !autoReveal || revealThreshold <= 0f) return; + if (CalcRevealProgress() >= revealThreshold) + RevealAll(); + } + + public float CalcRevealProgress() + { + if (maskRT == null || progressReadTex == null) return 0f; + + RenderTexture prev = RenderTexture.active; + RenderTexture.active = maskRT; + progressReadTex.ReadPixels(new Rect(0, 0, rtWidth, rtHeight), 0, 0, false); + progressReadTex.Apply(); + RenderTexture.active = prev; + + Color32[] pixels = progressReadTex.GetPixels32(); + int total = 0, cleared = 0; + int step = Mathf.Max(1, pixels.Length / 2048); + + for (int i = 0; i < pixels.Length; i += step) + { + total++; + if (pixels[i].r < 50) cleared++; + } + return total == 0 ? 0f : (float)cleared / total; + } + + // ================================================================ + // 工具 + // ================================================================ + + private static void ClearRT(RenderTexture rt, Color color) + { + RenderTexture prev = RenderTexture.active; + RenderTexture.active = rt; + GL.Clear(false, true, color); + RenderTexture.active = prev; + } + + private bool UVFromPointer(PointerEventData e, out Vector2 uv) + { + uv = Vector2.zero; + var rt = scratchImage.rectTransform; + if (!RectTransformUtility.ScreenPointToLocalPointInRectangle( + rt, e.position, e.pressEventCamera, out var localPos)) + return false; + + var rect = rt.rect; + if (rect.width <= 0f || rect.height <= 0f) return false; + + uv = new Vector2( + (localPos.x - rect.x) / rect.width, + (localPos.y - rect.y) / rect.height + ); + return uv.x >= 0f && uv.x <= 1f && uv.y >= 0f && uv.y <= 1f; + } + + private string RollAward() + { + if (awards == null || awards.Length == 0) return "谢谢参与"; + int n = Mathf.Min(awards.Length, awardWeights == null ? 0 : awardWeights.Length); + if (n <= 0) return awards[0]; + + float sum = 0f; + for (int i = 0; i < n; i++) sum += Mathf.Max(0f, awardWeights[i]); + if (sum <= 0f) return awards[0]; + + float r = Random.value * sum; + float acc = 0f; + for (int i = 0; i < n; i++) + { + acc += Mathf.Max(0f, awardWeights[i]); + if (r <= acc) return awards[i]; + } + return awards[n - 1]; + } + + public string CurrentAward => currentAward; + public bool IsRevealed => isRevealed; + + private void OnDestroy() + { + if (maskRT != null) { maskRT.Release(); Destroy(maskRT); } + if (instanceMaskMat != null) Destroy(instanceMaskMat); + if (instanceEraseMat != null) Destroy(instanceEraseMat); + if (progressReadTex != null) Destroy(progressReadTex); + } +} diff --git a/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe/GuaGuaLeGPU.cs.meta b/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe/GuaGuaLeGPU.cs.meta new file mode 100644 index 000000000..7cb9af843 --- /dev/null +++ b/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe/GuaGuaLeGPU.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d0a0dad83abe7024ba27b388d2ade860 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe/Mask.mat b/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe/Mask.mat new file mode 100644 index 000000000..2240b94e3 --- /dev/null +++ b/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe/Mask.mat @@ -0,0 +1,139 @@ +%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: Mask + m_Shader: {fileID: 4800000, guid: effb23f87c38a8d448caf597d8fa3059, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BrushSize: 0.06 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BrushPos: {r: 0.9961896, g: 0.7393387, b: 0, a: 0} + - _CoatColor: {r: 0.7, g: 0.7, b: 0.7, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &6975301354110920376 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 diff --git a/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe/Mask.mat.meta b/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe/Mask.mat.meta new file mode 100644 index 000000000..23a48f27d --- /dev/null +++ b/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe/Mask.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 16fb6fc82be36a540a74d11f90c0db6b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe/ScratchErase.shader b/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe/ScratchErase.shader new file mode 100644 index 000000000..46aa21966 --- /dev/null +++ b/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe/ScratchErase.shader @@ -0,0 +1,61 @@ +Shader "Hidden/ScratchErase" +{ + Properties + { + _MainTex ("Mask Texture", 2D) = "white" {} + _BrushPos ("Brush Position", Vector) = (0,0,0,0) + _BrushSize ("Brush Size", Float) = 0.05 + } + + SubShader + { + Tags { "RenderType"="Opaque" } + ZWrite Off + ZTest Always + Cull Off + + Pass + { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #include "UnityCG.cginc" + + sampler2D _MainTex; + float4 _BrushPos; + float _BrushSize; + + struct appdata { + float4 vertex : POSITION; + float2 uv : TEXCOORD0; + }; + + struct v2f { + float4 pos : SV_POSITION; + float2 uv : TEXCOORD0; + }; + + v2f vert(appdata v) + { + v2f o; + o.pos = UnityObjectToClipPos(v.vertex); + o.uv = v.uv; + return o; + } + + fixed4 frag(v2f i) : SV_Target + { + float dist = distance(i.uv, _BrushPos.xy); + + // 笔刷范围内 → 刮开（涂黑） + if (dist < _BrushSize) + return fixed4(0, 0, 0, 0); + + // 笔刷范围外 → 保持遮罩原有值 + fixed4 orig = tex2D(_MainTex, i.uv); + return orig; + } + ENDCG + } + } +} diff --git a/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe/ScratchErase.shader.meta b/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe/ScratchErase.shader.meta new file mode 100644 index 000000000..06f233b49 --- /dev/null +++ b/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe/ScratchErase.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: cd801917d70e7c04a8327c075aad35b1 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe/ScratchMask.shader b/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe/ScratchMask.shader new file mode 100644 index 000000000..f8966dce3 --- /dev/null +++ b/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe/ScratchMask.shader @@ -0,0 +1,57 @@ +Shader "UI/ScratchMask" +{ + Properties + { + _MaskTex ("Mask Texture", 2D) = "white" {} + _CoatColor ("Coat Color", Color) = (0.7, 0.7, 0.7, 1) + } + + SubShader + { + Tags { "Queue"="Transparent" "RenderType"="Transparent" } + Blend SrcAlpha OneMinusSrcAlpha + ZWrite Off + + Pass + { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #include "UnityCG.cginc" + + sampler2D _MaskTex; + fixed4 _CoatColor; + + struct appdata { + float4 vertex : POSITION; + float2 uv : TEXCOORD0; + }; + + struct v2f { + float4 pos : SV_POSITION; + float2 uv : TEXCOORD0; + }; + + v2f vert(appdata v) + { + v2f o; + o.pos = UnityObjectToClipPos(v.vertex); + o.uv = v.uv; + return o; + } + + fixed4 frag(v2f i) : SV_Target + { + fixed4 mask = tex2D(_MaskTex, i.uv); + + // mask.r = 0 → 已刮 → alpha = 0，完全透明（露出下面的奖品和文字） + // mask.r = 1 → 未刮 → alpha = 1，显示涂层色（盖住奖品和文字） + fixed4 color = _CoatColor; + color.a = mask.r; + + return color; + } + ENDCG + } + } +} diff --git a/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe/ScratchMask.shader.meta b/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe/ScratchMask.shader.meta new file mode 100644 index 000000000..beebed0ea --- /dev/null +++ b/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe/ScratchMask.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: effb23f87c38a8d448caf597d8fa3059 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe/er.mat b/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe/er.mat new file mode 100644 index 000000000..a1c0c5843 --- /dev/null +++ b/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe/er.mat @@ -0,0 +1,134 @@ +%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: er + m_Shader: {fileID: 4800000, guid: cd801917d70e7c04a8327c075aad35b1, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BrushSize: 0.06 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BrushPos: {r: 0.9961896, g: 0.7393387, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &6975301354110920376 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 diff --git a/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe/er.mat.meta b/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe/er.mat.meta new file mode 100644 index 000000000..ea01b5215 --- /dev/null +++ b/Assets/MyGame/aa/UI/DefaultPanel/GuaGuaLe/er.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3261f5202cdff64409572045cc75834c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/UI/Home/MainPanel.prefab b/Assets/MyGame/aa/UI/Home/MainPanel.prefab index d625bdb75..f5d3d3a48 100644 --- a/Assets/MyGame/aa/UI/Home/MainPanel.prefab +++ b/Assets/MyGame/aa/UI/Home/MainPanel.prefab @@ -291,9 +291,9 @@ RectTransform: - {fileID: 5242446602458029200} m_Father: {fileID: 7095845487138386970} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 447.49988, y: 55.999985} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 107, y: 109} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4979446292265166097 @@ -1314,6 +1314,7 @@ GameObject: m_Component: - component: {fileID: 7095845487138386970} - component: {fileID: 2542023152924674091} + - component: {fileID: 1278343270732311192} m_Layer: 0 m_Name: BottomButton m_TagString: Untagged @@ -1333,6 +1334,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1382706071284920527} - {fileID: 4395329833128410917} - {fileID: 1548821791665219514} - {fileID: 924147262963786292} @@ -1356,6 +1358,32 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 915573296200929389} m_CullTransparentMesh: 1 +--- !u!114 &1278343270732311192 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 915573296200929389} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &976627814742916862 GameObject: m_ObjectHideFlags: 0 @@ -1387,7 +1415,6 @@ RectTransform: m_Children: - {fileID: 1966558116143631329} - {fileID: 4653724501418068477} - - {fileID: 1382706071284920527} m_Father: {fileID: 1168244435367184264} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} @@ -1411,7 +1438,7 @@ MonoBehaviour: m_Left: 0 m_Right: 0 m_Top: 0 - m_Bottom: 0 + m_Bottom: 132 m_ChildAlignment: 4 m_Spacing: 19 m_ChildForceExpandWidth: 1 @@ -3216,9 +3243,9 @@ RectTransform: - {fileID: 8576071800163166750} m_Father: {fileID: 7095845487138386970} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 77.5, y: 55.999985} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 107, y: 109} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6483969407003219801 @@ -4038,10 +4065,10 @@ RectTransform: - {fileID: 3056312152478796948} m_Father: {fileID: 7095845487138386970} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -306.5, y: 55} - m_SizeDelta: {x: 106, y: 105} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 107, y: 109} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1748876595507280078 CanvasRenderer: @@ -6229,15 +6256,15 @@ RectTransform: m_GameObject: {fileID: 4348020444315061542} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 1382706071284920527} 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: 256, y: 256} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1020194819284908310 CanvasRenderer: @@ -6312,9 +6339,9 @@ RectTransform: - {fileID: 5937231523360318056} m_Father: {fileID: 7095845487138386970} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -52, y: 55.999985} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 107, y: 109} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8385685315657032351 @@ -7932,7 +7959,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4395329833128410917 RectTransform: m_ObjectHideFlags: 0 @@ -7952,7 +7979,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -449, y: 55} - m_SizeDelta: {x: 109, y: 111} + m_SizeDelta: {x: 107, y: 109} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7289468169315372215 CanvasRenderer: @@ -8205,9 +8232,9 @@ RectTransform: - {fileID: 5114635449444784476} m_Father: {fileID: 7095845487138386970} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 317.5, y: 55.999985} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 107, y: 109} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6606923548370354931 @@ -9017,9 +9044,9 @@ RectTransform: - {fileID: 8330960017132421114} m_Father: {fileID: 7095845487138386970} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 200.99988, y: 55.999985} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 107, y: 109} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &912397590783525566 @@ -10597,9 +10624,9 @@ RectTransform: - {fileID: 626290166600402111} m_Father: {fileID: 7095845487138386970} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -179, y: 56} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 107, y: 109} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &142408030020649767 @@ -10867,12 +10894,12 @@ RectTransform: m_Children: - {fileID: 3604835082534464121} - {fileID: 1197277745094663219} - m_Father: {fileID: 2564644207036948081} + m_Father: {fileID: 7095845487138386970} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 96, y: 92} + m_SizeDelta: {x: 107, y: 109} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1322584490137563638 CanvasRenderer: @@ -10902,7 +10929,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6caf440b00171b14282f4e572758266d, type: 3} + m_Sprite: {fileID: 21300000, guid: 4878a8b9f8421ef478fff8732447558c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/MyGame/aa/UI/Home/Sub/TurretPanel.prefab b/Assets/MyGame/aa/UI/Home/Sub/TurretPanel.prefab index c008b614b..b93570695 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/TurretPanel.prefab +++ b/Assets/MyGame/aa/UI/Home/Sub/TurretPanel.prefab @@ -1243,10 +1243,10 @@ RectTransform: - {fileID: 6468921829808028564} m_Father: {fileID: 3014377986955302398} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -646.5, y: -42.451} - m_SizeDelta: {x: -1319, y: -314.4314} + m_AnchorMin: {x: 0.0050000004, y: 0.12933333} + m_AnchorMax: {x: 0.20500001, y: 0.7373334} + m_AnchoredPosition: {x: -5, y: 7.549011} + m_SizeDelta: {x: -20, y: -20.431396} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1714714400766308370 CanvasRenderer: diff --git a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_JJJPanel.cs b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_JJJPanel.cs index 8ee881334..8c90c8873 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_JJJPanel.cs +++ b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_JJJPanel.cs @@ -1,46 +1,59 @@ -using Assets.MyGame.Scripts.Net; -using System.Collections; -using System.Collections.Generic; +using Assets.MyGame.Scripts.Net; +using Assets.MyGame.Scripts.Net.API.GameConfig_SubClass; using TMPro; using UnityEngine; using UnityEngine.UI; -using Assets.MyGame.Scripts.Net.APIRequest.Params; -using Assets.MyGame.Scripts.Net.APIResponses; public class UIHome_BY_JJJPanel : SubUIBase { public Button btn_Receive; - public Image img_DisReceive; public TextMeshProUGUI txt_coinsNum; public TextMeshProUGUI txt_TimeNum; + + private ReliefConfig reliefCfg; + public override void Awake() { base.Awake(); - - //添加金币 btn_Receive.onClick.AddListener(() => { - APIRequestList.GetRelief((callvack)=> + APIRequestList.GetRelief((callback) => { - UIManager.Instance.ShowBoardGongGao("救济金领取成功"); - //这里弹窗领取成功 + UIManager.Instance.ShowBoardError("救济金领取成功"); + // 领取后刷新面板 + RefreshPanel(); }); }); - } + protected override void OnShow(object args = null) { base.OnShow(args); + RefreshPanel(); + } + private void RefreshPanel() + { APIRequestList.GetReliefConfig(jjjData => { + reliefCfg = jjjData; + var user = GameManager.Instance.user; + long userGold = user.assets.gold; + txt_coinsNum.text = "金币" + jjjData.gold.ToString(); - if (GameManager.Instance.user.assets.gold < jjjData.limit && GameManager.Instance.user.@static.reliefGoldCount > 0) - img_DisReceive.gameObject.SetActive(false); - else - img_DisReceive.gameObject.SetActive(true); + txt_TimeNum.text = "剩余次数：" + user.@static.reliefGoldCount; + + // 判断是否可领取： + // ① 救济金已开启 + // ② 今天还有次数 (reliefGoldCount > 0) + // ③ 金币低于救济线 (gold < limit) + bool canReceive = jjjData.isOpen + && user.@static.reliefGoldCount > 0 + && userGold < jjjData.limit; + + img_DisReceive.gameObject.SetActive(!canReceive); + btn_Receive.interactable = canReceive; }); - } - + } } diff --git a/Assets/MyGame/aa/UI/Login/SubPanel/ReSetPassword.cs b/Assets/MyGame/aa/UI/Login/SubPanel/ReSetPassword.cs index 47b812297..0b5e9dac2 100644 --- a/Assets/MyGame/aa/UI/Login/SubPanel/ReSetPassword.cs +++ b/Assets/MyGame/aa/UI/Login/SubPanel/ReSetPassword.cs @@ -1,4 +1,4 @@ -using Assets.MyGame.Scripts.Net; +using Assets.MyGame.Scripts.Net; using Assets.MyGame.Scripts.Net.APIRequest.Params; using System.Collections; using System.Collections.Generic; @@ -9,7 +9,6 @@ using UnityEngine.UI; public class ReSetPassword : SubUIBase { public TMP_InputField tMPInput_UserName; - public TMP_InputField tMPInput_SFZName; public TMP_InputField tMPInput_SFZID; public TMP_InputField tMPInput_Password; @@ -19,10 +18,30 @@ public class ReSetPassword : SubUIBase public TextMeshProUGUI tMP_YZMDJS; public Button btn_YZM; public Button btn_ReSetPassWord; - // Start is called before the first frame update + + private string _realPassword = ""; + private string _realQueRenPassword = ""; + private Coroutine _maskCoroutine, _maskCoroutine2; + public override void Awake() { base.Awake(); + + // 手机号限制 11 位数字 + tMPInput_PhoneNumber.characterLimit = 11; + tMPInput_PhoneNumber.contentType = TMP_InputField.ContentType.IntegerNumber; + tMPInput_UserName.characterLimit = 11; + tMPInput_UserName.contentType = TMP_InputField.ContentType.IntegerNumber; + + // 身份证限制 18 位 + tMPInput_SFZID.characterLimit = 18; + + // 密码：Standard 模式 + 延迟遮罩 + tMPInput_Password.contentType = TMP_InputField.ContentType.Standard; + tMPInput_Password.onValueChanged.AddListener(v => OnPwdChanged(v, tMPInput_Password, ref _realPassword, ref _maskCoroutine)); + tMPInput_QueRenPassword.contentType = TMP_InputField.ContentType.Standard; + tMPInput_QueRenPassword.onValueChanged.AddListener(v => OnPwdChanged(v, tMPInput_QueRenPassword, ref _realQueRenPassword, ref _maskCoroutine2)); + btn_YZM.onClick.AddListener(() => { APIRequestList.YZM(new YZMParam @@ -30,24 +49,65 @@ public class ReSetPassword : SubUIBase mobile = tMPInput_PhoneNumber.text }, (a) => { - - UIManager.Instance.ShowBoardError(a); - + UIManager.Instance.ShowBoardError(a); }); }); + btn_ReSetPassWord.onClick.AddListener(() => { APIRequestList.ResetPassword(new ReSetPassWordParam { code = tMPInput_YZM.text, mobile = tMPInput_UserName.text, - password = tMPInput_Password.text + password = _realPassword }, (a) => { - - UIManager.Instance.ShowBoardError(a); + UIManager.Instance.ShowBoardError(a); uIManager.Close(UIPanel.ResetPasswordPanel); }); }); } + + private void OnPwdChanged(string display, TMP_InputField input, ref string real, ref Coroutine cr) + { + bool isAdd = real.Length < display.Length; + + if (isAdd) + { + for (int i = real.Length; i < display.Length; i++) + real += display[i]; + } + else if (real.Length > display.Length) + { + real = real.Substring(0, display.Length); + } + + int len = real.Length; + if (isAdd && len > 0) + { + string masked = new string('*', len - 1) + real[len - 1]; + input.SetTextWithoutNotify(masked); + input.caretPosition = len; + MaskAfterDelay(input, real, ref cr); + } + else + { + input.SetTextWithoutNotify(new string('*', len)); + input.caretPosition = len; + } + } + + private void MaskAfterDelay(TMP_InputField input, string real, ref Coroutine cr) + { + if (cr != null) StopCoroutine(cr); + cr = StartCoroutine(MaskRoutine(input, real)); + } + + private IEnumerator MaskRoutine(TMP_InputField input, string real) + { + yield return new WaitForSeconds(0.5f); + if (string.IsNullOrEmpty(real)) yield break; + input.SetTextWithoutNotify(new string('*', real.Length)); + input.caretPosition = real.Length; + } } diff --git a/Assets/MyGame/aa/UI/Login/SubPanel/RegisterPanel.cs b/Assets/MyGame/aa/UI/Login/SubPanel/RegisterPanel.cs index dd1e38cd6..e8332498c 100644 --- a/Assets/MyGame/aa/UI/Login/SubPanel/RegisterPanel.cs +++ b/Assets/MyGame/aa/UI/Login/SubPanel/RegisterPanel.cs @@ -1,4 +1,4 @@ -using Assets.MyGame.Scripts.Net; +using Assets.MyGame.Scripts.Net; using System.Collections; using System.Collections.Generic; using TMPro; @@ -16,34 +16,85 @@ public class RegisterPanel : SubUIBase public Image img_YZM; public Button btn_Register; + private string _realPassword = ""; + private string _realQueRenPassword = ""; + private Coroutine _maskCoroutine, _maskCoroutine2; + public override void Awake() { base.Awake(); + + // 手机号限制 11 位数字 + tMPInput_UserName.characterLimit = 11; + tMPInput_UserName.contentType = TMP_InputField.ContentType.IntegerNumber; + + // 身份证限制 18 位 + tMPInput_SFZID.characterLimit = 18; + + // 密码：Standard 模式 + 延迟遮罩 + tMPInput_Password.contentType = TMP_InputField.ContentType.Standard; + tMPInput_Password.onValueChanged.AddListener(v => OnPwdChanged(v, tMPInput_Password, ref _realPassword, ref _maskCoroutine)); + tMPInput_QueRenPassword.contentType = TMP_InputField.ContentType.Standard; + tMPInput_QueRenPassword.onValueChanged.AddListener(v => OnPwdChanged(v, tMPInput_QueRenPassword, ref _realQueRenPassword, ref _maskCoroutine2)); + btn_Register.onClick.AddListener(() => { APIRequestList.Register(new Assets.MyGame.Scripts.Net.APIRequest.Objs.RegisterObj { mobile = tMPInput_UserName.text, - passWord = tMPInput_Password.text, + passWord = _realPassword, realName = tMPInput_SFZName.text, iDCard = tMPInput_SFZID.text }, usertoke => { + WebSocketManager.Instance.Connect(SocketType.login); (uIManager.parentUIBase as UILoginPanel)?.Succeed(); + }); }); - - } - // Start is called before the first frame update - void Start() - { - } - // Update is called once per frame - void Update() + private void OnPwdChanged(string display, TMP_InputField input, ref string real, ref Coroutine cr) { - + bool isAdd = real.Length < display.Length; + + if (isAdd) + { + for (int i = real.Length; i < display.Length; i++) + real += display[i]; + } + else if (real.Length > display.Length) + { + real = real.Substring(0, display.Length); + } + + int len = real.Length; + if (isAdd && len > 0) + { + string masked = new string('*', len - 1) + real[len - 1]; + input.SetTextWithoutNotify(masked); + input.caretPosition = len; + MaskAfterDelay(input, real, ref cr); + } + else + { + input.SetTextWithoutNotify(new string('*', len)); + input.caretPosition = len; + } + } + + private void MaskAfterDelay(TMP_InputField input, string real, ref Coroutine cr) + { + if (cr != null) StopCoroutine(cr); + cr = StartCoroutine(MaskRoutine(input, real)); + } + + private IEnumerator MaskRoutine(TMP_InputField input, string real) + { + yield return new WaitForSeconds(0.5f); + if (string.IsNullOrEmpty(real)) yield break; + input.SetTextWithoutNotify(new string('*', real.Length)); + input.caretPosition = real.Length; } } diff --git a/Assets/UIResources/刮刮卡.meta b/Assets/UIResources/刮刮卡.meta new file mode 100644 index 000000000..72bf81922 --- /dev/null +++ b/Assets/UIResources/刮刮卡.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b9f4d55aed98763408f8c9ddb11eaf52 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/刮刮卡.psb b/Assets/UIResources/刮刮卡.psb new file mode 100644 index 000000000..80afa4892 Binary files /dev/null and b/Assets/UIResources/刮刮卡.psb differ diff --git a/Assets/UIResources/刮刮卡.psb.meta b/Assets/UIResources/刮刮卡.psb.meta new file mode 100644 index 000000000..ccb5a7f2a --- /dev/null +++ b/Assets/UIResources/刮刮卡.psb.meta @@ -0,0 +1,391 @@ +fileFormatVersion: 2 +guid: 899a316e94c356149b2b265f7e36e43d +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: b2a9591990af98743ba3ff7cf1000886, type: 3} + textureImporterSettings: + alphaSource: 1 + mipMapMode: 0 + enableMipMap: 1 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + convertToNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + swizzle: 50462976 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + nPOTScale: 1 + sRGBTexture: 1 + spriteMode: 2 + 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: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 0 + flipbookColumns: 0 + ignorePngGamma: 0 + cookieMode: 0 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + normalMap: 0 + textureFormat: 0 + maxTextureSize: 0 + lightmap: 0 + compressionQuality: 0 + linearTexture: 0 + grayScaleToAlpha: 0 + rGBM: 0 + cubemapConvolutionSteps: 0 + cubemapConvolutionExponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + spriteImportData: + - name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 0, y: 0} + spritePosition: {x: 0, y: 0} + mosaicSpriteImportData: [] + rigSpriteImportData: + - name: BY_PlaneInfoPanel_002 (1) + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 934 + y: 660 + width: 68 + height: 65 + spriteID: 6dd1f839f24f4244b8023f5c0c6701fb + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 934, y: 660} + spritePosition: {x: 724, y: 476} + - name: gk_jbk + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 435 + y: 588 + width: 382 + height: 144 + spriteID: 3127ceb33c5b4fd4b806bc3cc8ed6d62 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 435, y: 588} + spritePosition: {x: 258, y: 158} + - name: gk_jbz + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 840 + y: 4 + width: 103 + height: 38 + spriteID: 8239fcceebf8e1943a16305a2db63bce + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 840, y: 4} + spritePosition: {x: 395, y: 336} + - name: "3000\u4E07" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 934 + y: 733 + width: 57 + height: 16 + spriteID: ad8126e89d81e8c4181d93ba46391861 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 934, y: 733} + spritePosition: {x: 418, y: 188} + - name: icon_jinbi + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 934 + y: 588 + width: 85 + height: 64 + spriteID: 4b64330a8ab62d6458f1e766320caf40 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 934, y: 588} + spritePosition: {x: 403, y: 207} + - name: NZXL_New_zljl_bg19 + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 825 + y: 588 + width: 101 + height: 102 + spriteID: 091372972e6e02946a600d640ebee7f6 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 825, y: 588} + spritePosition: {x: 395, y: 179} + - name: gk_bs + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 588 + width: 423 + height: 162 + spriteID: 5f0b20cc0c7aabd41a79eb9633861987 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 588} + spritePosition: {x: 235, y: 149} + - name: "\u56FE\u5C42 1" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 4 + width: 828 + height: 576 + spriteID: 0540c92ac23ba2b4387a020b65024526 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 4} + spritePosition: {x: 0, y: 0} + characterData: + bones: [] + parts: [] + dimension: {x: 0, y: 0} + characterGroups: [] + pivot: {x: 0, y: 0} + boneReadOnly: 0 + sharedRigSpriteImportData: [] + sharedRigCharacterData: + bones: [] + parts: [] + dimension: {x: 0, y: 0} + characterGroups: [] + pivot: {x: 0, y: 0} + boneReadOnly: 0 + platformSettings: [] + mosaicLayers: 1 + characterMode: 1 + documentPivot: {x: 0, y: 0} + documentAlignment: 7 + importHiddenLayers: 0 + layerMappingOption: 2 + generatePhysicsShape: 0 + paperDollMode: 0 + keepDupilcateSpriteName: 1 + skeletonAssetReferenceID: + pipeline: {instanceID: 0} + pipelineVersion: + padding: 4 + spriteSizeExpand: 0 + spriteCategoryList: + categories: [] + spritePackingTag: + resliceFromLayer: 0 + mosaicPSDLayers: [] + rigPSDLayers: + - name: BY_PlaneInfoPanel_002 (1) + spriteName: BY_PlaneInfoPanel_002 (1) + isGroup: 0 + parentIndex: -1 + spriteID: 6dd1f839f24f4244b8023f5c0c6701fb + layerID: 13 + mosaicPosition: {x: 934, y: 660} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: gk_jbk + spriteName: gk_jbk + isGroup: 0 + parentIndex: -1 + spriteID: 3127ceb33c5b4fd4b806bc3cc8ed6d62 + layerID: 8 + mosaicPosition: {x: 435, y: 588} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: gk_jbz + spriteName: gk_jbz + isGroup: 0 + parentIndex: -1 + spriteID: 8239fcceebf8e1943a16305a2db63bce + layerID: 6 + mosaicPosition: {x: 840, y: 4} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "3000\u4E07" + spriteName: "3000\u4E07" + isGroup: 0 + parentIndex: -1 + spriteID: ad8126e89d81e8c4181d93ba46391861 + layerID: 12 + mosaicPosition: {x: 934, y: 733} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: icon_jinbi + spriteName: icon_jinbi + isGroup: 0 + parentIndex: -1 + spriteID: 4b64330a8ab62d6458f1e766320caf40 + layerID: 11 + mosaicPosition: {x: 934, y: 588} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: NZXL_New_zljl_bg19 + spriteName: NZXL_New_zljl_bg19 + isGroup: 0 + parentIndex: -1 + spriteID: 091372972e6e02946a600d640ebee7f6 + layerID: 10 + mosaicPosition: {x: 825, y: 588} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: gk_bs + spriteName: gk_bs + isGroup: 0 + parentIndex: -1 + spriteID: 5f0b20cc0c7aabd41a79eb9633861987 + layerID: 7 + mosaicPosition: {x: 4, y: 588} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u56FE\u5C42 1" + spriteName: "\u56FE\u5C42 1" + isGroup: 0 + parentIndex: -1 + spriteID: 0540c92ac23ba2b4387a020b65024526 + layerID: 2 + mosaicPosition: {x: 4, y: 4} + flatten: 0 + isImported: 1 + isVisible: 1 + sharedRigPSDLayers: [] + pSDLayerImportSetting: [] + importFileNodeState: 1 + platformSettingsDirtyTick: 0 + spriteSizeExpandChanged: 0 + generateGOHierarchy: 0 + textureAssetName: + prefabAssetName: + spriteLibAssetName: + skeletonAssetName: + secondarySpriteTextures: [] diff --git a/Assets/UIResources/刮刮卡/3000万.png b/Assets/UIResources/刮刮卡/3000万.png new file mode 100644 index 000000000..1b1c78370 Binary files /dev/null and b/Assets/UIResources/刮刮卡/3000万.png differ diff --git a/Assets/UIResources/刮刮卡/3000万.png.meta b/Assets/UIResources/刮刮卡/3000万.png.meta new file mode 100644 index 000000000..ab11f74c5 --- /dev/null +++ b/Assets/UIResources/刮刮卡/3000万.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 93ba17dae11d7fe4caa8a689343689e4 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/刮刮卡/BY_PlaneInfoPanel_002 (1).png b/Assets/UIResources/刮刮卡/BY_PlaneInfoPanel_002 (1).png new file mode 100644 index 000000000..54acb0516 Binary files /dev/null and b/Assets/UIResources/刮刮卡/BY_PlaneInfoPanel_002 (1).png differ diff --git a/Assets/UIResources/刮刮卡/BY_PlaneInfoPanel_002 (1).png.meta b/Assets/UIResources/刮刮卡/BY_PlaneInfoPanel_002 (1).png.meta new file mode 100644 index 000000000..4a241ecb0 --- /dev/null +++ b/Assets/UIResources/刮刮卡/BY_PlaneInfoPanel_002 (1).png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 860ec06da67b4d24b813e8c6eeeba562 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/刮刮卡/NZXL_New_zljl_bg19.png b/Assets/UIResources/刮刮卡/NZXL_New_zljl_bg19.png new file mode 100644 index 000000000..f196ae064 Binary files /dev/null and b/Assets/UIResources/刮刮卡/NZXL_New_zljl_bg19.png differ diff --git a/Assets/UIResources/刮刮卡/NZXL_New_zljl_bg19.png.meta b/Assets/UIResources/刮刮卡/NZXL_New_zljl_bg19.png.meta new file mode 100644 index 000000000..4562ca415 --- /dev/null +++ b/Assets/UIResources/刮刮卡/NZXL_New_zljl_bg19.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 83bc201b0411b30428cb2fd52a3a5696 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/刮刮卡/gk_bs.png b/Assets/UIResources/刮刮卡/gk_bs.png new file mode 100644 index 000000000..5b005d837 Binary files /dev/null and b/Assets/UIResources/刮刮卡/gk_bs.png differ diff --git a/Assets/UIResources/刮刮卡/gk_bs.png.meta b/Assets/UIResources/刮刮卡/gk_bs.png.meta new file mode 100644 index 000000000..b59ad1830 --- /dev/null +++ b/Assets/UIResources/刮刮卡/gk_bs.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 9900a9f79d8f40940aea21bfac3281bd +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/刮刮卡/gk_jbk.png b/Assets/UIResources/刮刮卡/gk_jbk.png new file mode 100644 index 000000000..657ea81b0 Binary files /dev/null and b/Assets/UIResources/刮刮卡/gk_jbk.png differ diff --git a/Assets/UIResources/刮刮卡/gk_jbk.png.meta b/Assets/UIResources/刮刮卡/gk_jbk.png.meta new file mode 100644 index 000000000..b440934d4 --- /dev/null +++ b/Assets/UIResources/刮刮卡/gk_jbk.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 979eebfff6074f94998fdc2a7b10eaef +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/刮刮卡/gk_jbz.png b/Assets/UIResources/刮刮卡/gk_jbz.png new file mode 100644 index 000000000..133d41dcf Binary files /dev/null and b/Assets/UIResources/刮刮卡/gk_jbz.png differ diff --git a/Assets/UIResources/刮刮卡/gk_jbz.png.meta b/Assets/UIResources/刮刮卡/gk_jbz.png.meta new file mode 100644 index 000000000..aaaa0bcc2 --- /dev/null +++ b/Assets/UIResources/刮刮卡/gk_jbz.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: f0c207cdaefb27d499d61d8ed627f440 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/刮刮卡/icon_jinbi.png b/Assets/UIResources/刮刮卡/icon_jinbi.png new file mode 100644 index 000000000..7f1f58427 Binary files /dev/null and b/Assets/UIResources/刮刮卡/icon_jinbi.png differ diff --git a/Assets/UIResources/刮刮卡/icon_jinbi.png.meta b/Assets/UIResources/刮刮卡/icon_jinbi.png.meta new file mode 100644 index 000000000..d40686900 --- /dev/null +++ b/Assets/UIResources/刮刮卡/icon_jinbi.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: f913511fd7e863d45ac93b62c7fd4354 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/刮刮卡/图层 1.png b/Assets/UIResources/刮刮卡/图层 1.png new file mode 100644 index 000000000..d1408b352 Binary files /dev/null and b/Assets/UIResources/刮刮卡/图层 1.png differ diff --git a/Assets/UIResources/刮刮卡/图层 1.png.meta b/Assets/UIResources/刮刮卡/图层 1.png.meta new file mode 100644 index 000000000..9f5810e4a --- /dev/null +++ b/Assets/UIResources/刮刮卡/图层 1.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: cf02a39539eaf9a4288c66d3c22d1980 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: