diff --git a/Assets/MyGame/Scenes/UIScene.unity b/Assets/MyGame/Scenes/UIScene.unity index a82b34a4e..743b22a59 100644 --- a/Assets/MyGame/Scenes/UIScene.unity +++ b/Assets/MyGame/Scenes/UIScene.unity @@ -1098,7 +1098,7 @@ BoxCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 63.9, y: 0} @@ -1978,7 +1978,7 @@ BoxCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: 31.356647} @@ -2288,7 +2288,7 @@ BoxCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: -31.5} @@ -2796,7 +2796,7 @@ BoxCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: -63.422134, y: 0} @@ -4289,7 +4289,7 @@ MonoBehaviour: spawnList: [] isCreateFish: 0 isFrozen: 0 - debugSpawnFishNumber: 11029 + debugSpawnFishNumber: 12029 isleft: 0 debugSpawnAllLines: 0 fishList_All: [] diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/XiaoChouPuKe/PW_Effect_AwardFrame_Poker Variant.prefab b/Assets/MyGame/aa/Game/XJMH/Boss/XiaoChouPuKe/PW_Effect_AwardFrame_Poker Variant.prefab index 85c3381f5..2307f55be 100644 --- a/Assets/MyGame/aa/Game/XJMH/Boss/XiaoChouPuKe/PW_Effect_AwardFrame_Poker Variant.prefab +++ b/Assets/MyGame/aa/Game/XJMH/Boss/XiaoChouPuKe/PW_Effect_AwardFrame_Poker Variant.prefab @@ -575,6 +575,66 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} + - target: {fileID: 2154813267819608932, guid: f0d445180880e4e419ac5047f2149d2c, + type: 3} + propertyPath: m_margin.y + value: -6.7751465 + objectReference: {fileID: 0} + - target: {fileID: 2154813267819608932, guid: f0d445180880e4e419ac5047f2149d2c, + type: 3} + propertyPath: m_fontColor.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2154813267819608932, guid: f0d445180880e4e419ac5047f2149d2c, + type: 3} + propertyPath: m_fontColor.g + value: 0.93725497 + objectReference: {fileID: 0} + - target: {fileID: 2154813267819608932, guid: f0d445180880e4e419ac5047f2149d2c, + type: 3} + propertyPath: m_fontColor.r + value: 0.9960785 + objectReference: {fileID: 0} + - target: {fileID: 2154813267819608932, guid: f0d445180880e4e419ac5047f2149d2c, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 97512fd3515f8d44a8f1b990d5648f96, type: 2} + - target: {fileID: 2154813267819608932, guid: f0d445180880e4e419ac5047f2149d2c, + type: 3} + propertyPath: m_fontColor32.rgba + value: 4278251518 + objectReference: {fileID: 0} + - target: {fileID: 6869835418651269120, guid: f0d445180880e4e419ac5047f2149d2c, + type: 3} + propertyPath: m_margin.y + value: -6.7751465 + objectReference: {fileID: 0} + - target: {fileID: 6869835418651269120, guid: f0d445180880e4e419ac5047f2149d2c, + type: 3} + propertyPath: m_fontStyle + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6869835418651269120, guid: f0d445180880e4e419ac5047f2149d2c, + type: 3} + propertyPath: m_fontColor.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6869835418651269120, guid: f0d445180880e4e419ac5047f2149d2c, + type: 3} + propertyPath: m_fontColor.g + value: 0.94117653 + objectReference: {fileID: 0} + - target: {fileID: 6869835418651269120, guid: f0d445180880e4e419ac5047f2149d2c, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 97512fd3515f8d44a8f1b990d5648f96, type: 2} + - target: {fileID: 6869835418651269120, guid: f0d445180880e4e419ac5047f2149d2c, + type: 3} + propertyPath: m_fontColor32.rgba + value: 4278251775 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: - {fileID: 1039449459520011, guid: f0d445180880e4e419ac5047f2149d2c, type: 3} @@ -649,7 +709,6 @@ MonoBehaviour: fishScore: 0 bJbeishu: 0 maxScore: 0 - startOffset: {x: 0, y: 0, z: -100} isSelf: 0 isScoreEnd: 0 useScorePanel: 0 diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/XingJiXunHang/XingJiXunHangEvent.cs b/Assets/MyGame/aa/Game/XJMH/Boss/XingJiXunHang/XingJiXunHangEvent.cs index 9b0a87b4a..285b51853 100644 --- a/Assets/MyGame/aa/Game/XJMH/Boss/XingJiXunHang/XingJiXunHangEvent.cs +++ b/Assets/MyGame/aa/Game/XJMH/Boss/XingJiXunHang/XingJiXunHangEvent.cs @@ -99,6 +99,8 @@ public class XingJiXunHangEvent : BJRedPacketEvent public GameObject settleGammaStormOther; [Tooltip("伽马风暴暴击框(PW_Effect_Crit_GammaStorm_XingJiXunHang)")] public GameObject critFrameGammaStorm; + [Tooltip("是否显示伽马风暴暴击框。当前关闭;需要时在面板上勾上即可恢复,不用改代码")] + public bool enableGammaCritFrame = false; [Tooltip("伽马风暴海报Sprite(Prop_Poster_GammaStorm),设置到FullScreen的knock_tip上")] public Sprite posterGammaStorm; @@ -115,6 +117,8 @@ public class XingJiXunHangEvent : BJRedPacketEvent public string critNodeName = "Crit"; [Tooltip("暴击文字弹出后停留时长(秒),之后整体缩小消失(默认0.8)")] public float critHoldDuration = 0.8f; + [Tooltip("是否播放满屏暴击文字。当前暂时关闭;需要时在面板上勾上即可恢复,不用改代码")] + public bool enableTextCrit = false; // ==================== 道具出场特效 ==================== @@ -407,7 +411,6 @@ public class XingJiXunHangEvent : BJRedPacketEvent /// 根据武器 ID 选择对应的预制体和标签 private void SelectWeaponPrefabs() { - _weaponId = 6; switch (_weaponId) { case 0: @@ -538,14 +541,16 @@ public class XingJiXunHangEvent : BJRedPacketEvent } // -------- Phase 6: 满屏暴击文字(仅 IronFist/GammaStorm) -------- - if (_weaponId == 6 || _weaponId == 7) + // ⭐ 当前暂时关闭:enableTextCrit=false 时不生成(需要在面板上勾选恢复) + if ((_weaponId == 6 || _weaponId == 7) && enableTextCrit) { PlayTextCrit(); yield return new WaitForSeconds(0.5f); } // -------- Phase 6.5: 伽马风暴暴击框 -------- - if (_weaponId == 7 && critFrameGammaStorm != null) + // ⭐ 当前关闭:enableGammaCritFrame=false 时不生成(需要在面板上勾选恢复) + if (_weaponId == 7 && critFrameGammaStorm != null && enableGammaCritFrame) { PlayGammaStormCritFrame(); yield return new WaitForSeconds(0.5f); diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/XingJiXunHang/dieFXPrefabAwardTmp.prefab b/Assets/MyGame/aa/Game/XJMH/Boss/XingJiXunHang/dieFXPrefabAwardTmp.prefab index 5d521d805..ac3f5e743 100644 --- a/Assets/MyGame/aa/Game/XJMH/Boss/XingJiXunHang/dieFXPrefabAwardTmp.prefab +++ b/Assets/MyGame/aa/Game/XJMH/Boss/XingJiXunHang/dieFXPrefabAwardTmp.prefab @@ -115,6 +115,7 @@ MonoBehaviour: critTextNodeName: Text critNodeName: Crit critHoldDuration: 0.8 + enableTextCrit: 0 appearPropEffect: {fileID: 1507404544299976, guid: aa6d30193550ca949a8a9098575de5e0, type: 3} tapTipName: tap_tip @@ -130,7 +131,7 @@ MonoBehaviour: m_Bits: 64 ironFistKillFish: 1 ironFistKillTotalTime: 1 - ironFistAwardDelay: 2 + ironFistAwardDelay: 1 symmetraLockName: Lock symmetraPropLName: PropL symmetraPropRName: PropR diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/XingYunFeiDie/PW_Effect_AwardFrame_Dial Variant.prefab b/Assets/MyGame/aa/Game/XJMH/Boss/XingYunFeiDie/PW_Effect_AwardFrame_Dial Variant.prefab index 5f8ca3aa9..4d476fa3e 100644 --- a/Assets/MyGame/aa/Game/XJMH/Boss/XingYunFeiDie/PW_Effect_AwardFrame_Dial Variant.prefab +++ b/Assets/MyGame/aa/Game/XJMH/Boss/XingYunFeiDie/PW_Effect_AwardFrame_Dial Variant.prefab @@ -96,6 +96,11 @@ PrefabInstance: propertyPath: m_fontSizeBase value: 16.56 objectReference: {fileID: 0} + - target: {fileID: 147187610052521182, guid: a6cf5d80cc474df44ba67c8d6baa0903, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 97512fd3515f8d44a8f1b990d5648f96, type: 2} - target: {fileID: 199047072744213566, guid: a6cf5d80cc474df44ba67c8d6baa0903, type: 3} propertyPath: m_SortingLayer @@ -424,8 +429,13 @@ PrefabInstance: - target: {fileID: 619221787769737936, guid: a6cf5d80cc474df44ba67c8d6baa0903, type: 3} propertyPath: m_fontStyle - value: 0 + value: 1 objectReference: {fileID: 0} + - target: {fileID: 619221787769737936, guid: a6cf5d80cc474df44ba67c8d6baa0903, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 97512fd3515f8d44a8f1b990d5648f96, type: 2} - target: {fileID: 2282205603187603573, guid: a6cf5d80cc474df44ba67c8d6baa0903, type: 3} propertyPath: m_text @@ -446,6 +456,11 @@ PrefabInstance: propertyPath: m_fontSizeBase value: 16.56 objectReference: {fileID: 0} + - target: {fileID: 2282205603187603573, guid: a6cf5d80cc474df44ba67c8d6baa0903, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 97512fd3515f8d44a8f1b990d5648f96, type: 2} - target: {fileID: 2390172117750425844, guid: a6cf5d80cc474df44ba67c8d6baa0903, type: 3} propertyPath: m_text @@ -466,6 +481,11 @@ PrefabInstance: propertyPath: m_fontSizeBase value: 16.56 objectReference: {fileID: 0} + - target: {fileID: 2390172117750425844, guid: a6cf5d80cc474df44ba67c8d6baa0903, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 97512fd3515f8d44a8f1b990d5648f96, type: 2} - target: {fileID: 2642731299645435136, guid: a6cf5d80cc474df44ba67c8d6baa0903, type: 3} propertyPath: m_text @@ -474,8 +494,13 @@ PrefabInstance: - target: {fileID: 2642731299645435136, guid: a6cf5d80cc474df44ba67c8d6baa0903, type: 3} propertyPath: m_fontStyle - value: 0 + value: 1 objectReference: {fileID: 0} + - target: {fileID: 2642731299645435136, guid: a6cf5d80cc474df44ba67c8d6baa0903, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 97512fd3515f8d44a8f1b990d5648f96, type: 2} - target: {fileID: 3644307719108351519, guid: a6cf5d80cc474df44ba67c8d6baa0903, type: 3} propertyPath: m_text @@ -498,6 +523,11 @@ PrefabInstance: propertyPath: m_fontSizeBase value: 16.56 objectReference: {fileID: 0} + - target: {fileID: 3644307719108351519, guid: a6cf5d80cc474df44ba67c8d6baa0903, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 97512fd3515f8d44a8f1b990d5648f96, type: 2} - target: {fileID: 3889473570124707996, guid: a6cf5d80cc474df44ba67c8d6baa0903, type: 3} propertyPath: m_text @@ -506,8 +536,43 @@ PrefabInstance: - target: {fileID: 3889473570124707996, guid: a6cf5d80cc474df44ba67c8d6baa0903, type: 3} propertyPath: m_fontStyle + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3889473570124707996, guid: a6cf5d80cc474df44ba67c8d6baa0903, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 97512fd3515f8d44a8f1b990d5648f96, type: 2} + - target: {fileID: 4046866495200705318, guid: a6cf5d80cc474df44ba67c8d6baa0903, + type: 3} + propertyPath: m_fontStyle + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4046866495200705318, guid: a6cf5d80cc474df44ba67c8d6baa0903, + type: 3} + propertyPath: m_fontColor.b value: 0 objectReference: {fileID: 0} + - target: {fileID: 4046866495200705318, guid: a6cf5d80cc474df44ba67c8d6baa0903, + type: 3} + propertyPath: m_fontColor.g + value: 0.9294118 + objectReference: {fileID: 0} + - target: {fileID: 4046866495200705318, guid: a6cf5d80cc474df44ba67c8d6baa0903, + type: 3} + propertyPath: m_fontColor.r + value: 0.9921569 + objectReference: {fileID: 0} + - target: {fileID: 4046866495200705318, guid: a6cf5d80cc474df44ba67c8d6baa0903, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 97512fd3515f8d44a8f1b990d5648f96, type: 2} + - target: {fileID: 4046866495200705318, guid: a6cf5d80cc474df44ba67c8d6baa0903, + type: 3} + propertyPath: m_fontColor32.rgba + value: 4278251005 + objectReference: {fileID: 0} - target: {fileID: 4858431950575271926, guid: a6cf5d80cc474df44ba67c8d6baa0903, type: 3} propertyPath: m_text @@ -516,8 +581,13 @@ PrefabInstance: - target: {fileID: 4858431950575271926, guid: a6cf5d80cc474df44ba67c8d6baa0903, type: 3} propertyPath: m_fontStyle - value: 0 + value: 1 objectReference: {fileID: 0} + - target: {fileID: 4858431950575271926, guid: a6cf5d80cc474df44ba67c8d6baa0903, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 97512fd3515f8d44a8f1b990d5648f96, type: 2} - target: {fileID: 4936244412202659441, guid: a6cf5d80cc474df44ba67c8d6baa0903, type: 3} propertyPath: m_text @@ -528,8 +598,13 @@ PrefabInstance: - target: {fileID: 4936244412202659441, guid: a6cf5d80cc474df44ba67c8d6baa0903, type: 3} propertyPath: m_fontStyle - value: 0 + value: 1 objectReference: {fileID: 0} + - target: {fileID: 4936244412202659441, guid: a6cf5d80cc474df44ba67c8d6baa0903, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 97512fd3515f8d44a8f1b990d5648f96, type: 2} - target: {fileID: 5460516637555709959, guid: a6cf5d80cc474df44ba67c8d6baa0903, type: 3} propertyPath: m_text @@ -550,6 +625,11 @@ PrefabInstance: propertyPath: m_fontSizeBase value: 16.56 objectReference: {fileID: 0} + - target: {fileID: 5460516637555709959, guid: a6cf5d80cc474df44ba67c8d6baa0903, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 97512fd3515f8d44a8f1b990d5648f96, type: 2} - target: {fileID: 6035376780308426613, guid: a6cf5d80cc474df44ba67c8d6baa0903, type: 3} propertyPath: m_text @@ -558,8 +638,13 @@ PrefabInstance: - target: {fileID: 6035376780308426613, guid: a6cf5d80cc474df44ba67c8d6baa0903, type: 3} propertyPath: m_fontStyle - value: 0 + value: 1 objectReference: {fileID: 0} + - target: {fileID: 6035376780308426613, guid: a6cf5d80cc474df44ba67c8d6baa0903, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 97512fd3515f8d44a8f1b990d5648f96, type: 2} - target: {fileID: 6309544168674433995, guid: a6cf5d80cc474df44ba67c8d6baa0903, type: 3} propertyPath: m_text @@ -568,8 +653,13 @@ PrefabInstance: - target: {fileID: 6309544168674433995, guid: a6cf5d80cc474df44ba67c8d6baa0903, type: 3} propertyPath: m_fontStyle - value: 0 + value: 1 objectReference: {fileID: 0} + - target: {fileID: 6309544168674433995, guid: a6cf5d80cc474df44ba67c8d6baa0903, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 97512fd3515f8d44a8f1b990d5648f96, type: 2} - target: {fileID: 6667599478860122501, guid: a6cf5d80cc474df44ba67c8d6baa0903, type: 3} propertyPath: m_text @@ -580,8 +670,13 @@ PrefabInstance: - target: {fileID: 6667599478860122501, guid: a6cf5d80cc474df44ba67c8d6baa0903, type: 3} propertyPath: m_fontStyle - value: 0 + value: 1 objectReference: {fileID: 0} + - target: {fileID: 6667599478860122501, guid: a6cf5d80cc474df44ba67c8d6baa0903, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 97512fd3515f8d44a8f1b990d5648f96, type: 2} - target: {fileID: 6975763539012114229, guid: a6cf5d80cc474df44ba67c8d6baa0903, type: 3} propertyPath: m_LocalScale.x @@ -607,8 +702,13 @@ PrefabInstance: - target: {fileID: 6989744739303446546, guid: a6cf5d80cc474df44ba67c8d6baa0903, type: 3} propertyPath: m_fontStyle - value: 0 + value: 1 objectReference: {fileID: 0} + - target: {fileID: 6989744739303446546, guid: a6cf5d80cc474df44ba67c8d6baa0903, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 97512fd3515f8d44a8f1b990d5648f96, type: 2} - target: {fileID: 7021681363181186356, guid: a6cf5d80cc474df44ba67c8d6baa0903, type: 3} propertyPath: m_text @@ -629,6 +729,11 @@ PrefabInstance: propertyPath: m_fontSizeBase value: 16.56 objectReference: {fileID: 0} + - target: {fileID: 7021681363181186356, guid: a6cf5d80cc474df44ba67c8d6baa0903, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 97512fd3515f8d44a8f1b990d5648f96, type: 2} - target: {fileID: 8176498001999684254, guid: a6cf5d80cc474df44ba67c8d6baa0903, type: 3} propertyPath: m_text @@ -649,6 +754,11 @@ PrefabInstance: propertyPath: m_fontSizeBase value: 16.56 objectReference: {fileID: 0} + - target: {fileID: 8176498001999684254, guid: a6cf5d80cc474df44ba67c8d6baa0903, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 97512fd3515f8d44a8f1b990d5648f96, type: 2} - target: {fileID: 8445839961574755376, guid: a6cf5d80cc474df44ba67c8d6baa0903, type: 3} propertyPath: m_text @@ -659,8 +769,13 @@ PrefabInstance: - target: {fileID: 8445839961574755376, guid: a6cf5d80cc474df44ba67c8d6baa0903, type: 3} propertyPath: m_fontStyle - value: 0 + value: 1 objectReference: {fileID: 0} + - target: {fileID: 8445839961574755376, guid: a6cf5d80cc474df44ba67c8d6baa0903, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 97512fd3515f8d44a8f1b990d5648f96, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -695,7 +810,6 @@ MonoBehaviour: fishScore: 0 bJbeishu: 0 maxScore: 0 - startOffset: {x: 0, y: 0, z: -100} isSelf: 0 isScoreEnd: 0 useScorePanel: 0 diff --git a/Assets/MyGame/aa/Game/ZhanShen/New Material.mat b/Assets/MyGame/aa/Game/ZhanShen/New Material.mat index 6d5b66361..bda967297 100644 --- a/Assets/MyGame/aa/Game/ZhanShen/New Material.mat +++ b/Assets/MyGame/aa/Game/ZhanShen/New Material.mat @@ -21,7 +21,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: New Material - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 10761, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -30,8 +30,7 @@ Material: m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: @@ -57,6 +56,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailTex: + m_Texture: {fileID: 2800000, guid: 9148a92511638c249b6dd0afa43247a0, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _EmissionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -102,6 +105,7 @@ Material: - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 + - _ColorMask: 15 - _Cull: 2 - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 @@ -122,7 +126,14 @@ Material: - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _Strength: 0.2 - _Surface: 0 + - _UseUIAlphaClip: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: diff --git a/Assets/MyGame/aa/UI/Home/Sub/Activity/ChouJiang.prefab b/Assets/MyGame/aa/UI/Home/Sub/Activity/ChouJiang.prefab index c8c90d43c..07957a4a3 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/Activity/ChouJiang.prefab +++ b/Assets/MyGame/aa/UI/Home/Sub/Activity/ChouJiang.prefab @@ -90,11 +90,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 17 prefab_DrawEffect: {fileID: 4205399302806765581} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 4c445b5ca73942b42adde2b1381b7b56, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -204,10 +206,12 @@ MonoBehaviour: itemId: 14 prefab_DrawEffect: {fileID: 5873423488490184862} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: df0018cf06e35f64594f8a3e71e34b37, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -391,11 +395,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 7 prefab_DrawEffect: {fileID: 4205399302806765581} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 4c445b5ca73942b42adde2b1381b7b56, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -504,11 +510,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 4 prefab_DrawEffect: {fileID: 2404213555508628135} - iconRatio: 0.85 + iconRatio: 0.6 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 7c6adff169b4892498b97b84f5eab5a4, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -617,11 +625,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 8 prefab_DrawEffect: {fileID: 4205399302806765581} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 4c445b5ca73942b42adde2b1381b7b56, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -733,11 +743,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 1 prefab_DrawEffect: {fileID: 7633571334989700766} - iconRatio: 0.85 + iconRatio: 0.5 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 4c445b5ca73942b42adde2b1381b7b56, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -921,11 +933,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 9 prefab_DrawEffect: {fileID: 2404213555508628135} - iconRatio: 0.85 + iconRatio: 0.6 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 7c6adff169b4892498b97b84f5eab5a4, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -1034,11 +1048,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 11 prefab_DrawEffect: {fileID: 4832793209706918115} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 7c6adff169b4892498b97b84f5eab5a4, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -1147,11 +1163,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 16 prefab_DrawEffect: {fileID: 4205399302806765581} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 4c445b5ca73942b42adde2b1381b7b56, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -1260,11 +1278,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 10 prefab_DrawEffect: {fileID: 4205399302806765581} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 4c445b5ca73942b42adde2b1381b7b56, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -1374,10 +1394,12 @@ MonoBehaviour: itemId: 4 prefab_DrawEffect: {fileID: 5873423488490184862} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: df0018cf06e35f64594f8a3e71e34b37, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -1634,11 +1656,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 3 prefab_DrawEffect: {fileID: 2404213555508628135} - iconRatio: 0.85 + iconRatio: 0.6 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 7c6adff169b4892498b97b84f5eab5a4, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -1747,11 +1771,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 5 prefab_DrawEffect: {fileID: 2404213555508628135} - iconRatio: 0.85 + iconRatio: 0.6 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 7c6adff169b4892498b97b84f5eab5a4, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -1861,10 +1887,12 @@ MonoBehaviour: itemId: 8 prefab_DrawEffect: {fileID: 5873423488490184862} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: df0018cf06e35f64594f8a3e71e34b37, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -1975,11 +2003,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 1 prefab_DrawEffect: {fileID: 4502140238942993933} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 548cb9d9630041e4d8687b54cbe69b29, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -2089,10 +2119,12 @@ MonoBehaviour: itemId: 15 prefab_DrawEffect: {fileID: 5873423488490184862} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: df0018cf06e35f64594f8a3e71e34b37, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -2210,11 +2242,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 2 prefab_DrawEffect: {fileID: 4205399302806765581} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 4c445b5ca73942b42adde2b1381b7b56, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -2323,11 +2357,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 10 prefab_DrawEffect: {fileID: 4832793209706918115} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 7c6adff169b4892498b97b84f5eab5a4, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -2436,11 +2472,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 9 prefab_DrawEffect: {fileID: 4832793209706918115} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 7c6adff169b4892498b97b84f5eab5a4, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -2550,10 +2588,12 @@ MonoBehaviour: itemId: 17 prefab_DrawEffect: {fileID: 5873423488490184862} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: df0018cf06e35f64594f8a3e71e34b37, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -2662,11 +2702,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 18 prefab_DrawEffect: {fileID: 4832793209706918115} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 7c6adff169b4892498b97b84f5eab5a4, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -2925,11 +2967,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 14 prefab_DrawEffect: {fileID: 4832793209706918115} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 7c6adff169b4892498b97b84f5eab5a4, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -3038,11 +3082,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 8 prefab_DrawEffect: {fileID: 7633571334989700766} - iconRatio: 0.85 + iconRatio: 0.5 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 4c445b5ca73942b42adde2b1381b7b56, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -3152,10 +3198,12 @@ MonoBehaviour: itemId: 24 prefab_DrawEffect: {fileID: 5873423488490184862} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: df0018cf06e35f64594f8a3e71e34b37, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -3385,11 +3433,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 12 prefab_DrawEffect: {fileID: 4832793209706918115} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 7c6adff169b4892498b97b84f5eab5a4, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -3498,11 +3548,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 6 prefab_DrawEffect: {fileID: 4205399302806765581} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 4c445b5ca73942b42adde2b1381b7b56, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -3612,11 +3664,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 2 prefab_DrawEffect: {fileID: 4502140238942993933} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 548cb9d9630041e4d8687b54cbe69b29, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -3725,11 +3779,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 7 prefab_DrawEffect: {fileID: 7633571334989700766} - iconRatio: 0.85 + iconRatio: 0.5 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 4c445b5ca73942b42adde2b1381b7b56, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -3914,10 +3970,12 @@ MonoBehaviour: itemId: 7 prefab_DrawEffect: {fileID: 5873423488490184862} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: df0018cf06e35f64594f8a3e71e34b37, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -4026,11 +4084,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 10 prefab_DrawEffect: {fileID: 2404213555508628135} - iconRatio: 0.85 + iconRatio: 0.6 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 7c6adff169b4892498b97b84f5eab5a4, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -4140,10 +4200,12 @@ MonoBehaviour: itemId: 16 prefab_DrawEffect: {fileID: 5873423488490184862} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: df0018cf06e35f64594f8a3e71e34b37, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -4253,10 +4315,12 @@ MonoBehaviour: itemId: 1 prefab_DrawEffect: {fileID: 0} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 0} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -4365,11 +4429,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 19 prefab_DrawEffect: {fileID: 4205399302806765581} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 4c445b5ca73942b42adde2b1381b7b56, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -4478,11 +4544,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 4 prefab_DrawEffect: {fileID: 4832793209706918115} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 7c6adff169b4892498b97b84f5eab5a4, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -4592,10 +4660,12 @@ MonoBehaviour: itemId: 10 prefab_DrawEffect: {fileID: 5873423488490184862} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: df0018cf06e35f64594f8a3e71e34b37, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -4705,10 +4775,12 @@ MonoBehaviour: itemId: 12 prefab_DrawEffect: {fileID: 5873423488490184862} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: df0018cf06e35f64594f8a3e71e34b37, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -4818,10 +4890,12 @@ MonoBehaviour: itemId: 20 prefab_DrawEffect: {fileID: 5873423488490184862} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: df0018cf06e35f64594f8a3e71e34b37, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -4942,10 +5016,12 @@ MonoBehaviour: itemId: 1 prefab_DrawEffect: {fileID: 5873423488490184862} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: df0018cf06e35f64594f8a3e71e34b37, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -5098,11 +5174,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 18 prefab_DrawEffect: {fileID: 4205399302806765581} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 4c445b5ca73942b42adde2b1381b7b56, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -5339,11 +5417,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 6 prefab_DrawEffect: {fileID: 2404213555508628135} - iconRatio: 0.85 + iconRatio: 0.6 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 7c6adff169b4892498b97b84f5eab5a4, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -5452,11 +5532,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 6 prefab_DrawEffect: {fileID: 7633571334989700766} - iconRatio: 0.85 + iconRatio: 0.5 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 4c445b5ca73942b42adde2b1381b7b56, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -5715,11 +5797,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 7 prefab_DrawEffect: {fileID: 4832793209706918115} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 7c6adff169b4892498b97b84f5eab5a4, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -6219,11 +6303,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 1 prefab_DrawEffect: {fileID: 2404213555508628135} - iconRatio: 0.85 + iconRatio: 0.6 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 7c6adff169b4892498b97b84f5eab5a4, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -6416,11 +6502,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 1 prefab_DrawEffect: {fileID: 4832793209706918115} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 7c6adff169b4892498b97b84f5eab5a4, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -6680,10 +6768,12 @@ MonoBehaviour: itemId: 3 prefab_DrawEffect: {fileID: 5873423488490184862} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: df0018cf06e35f64594f8a3e71e34b37, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -6793,10 +6883,12 @@ MonoBehaviour: itemId: 2 prefab_DrawEffect: {fileID: 0} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 0} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -6981,11 +7073,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 5 prefab_DrawEffect: {fileID: 4832793209706918115} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 7c6adff169b4892498b97b84f5eab5a4, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -7095,10 +7189,12 @@ MonoBehaviour: itemId: 6 prefab_DrawEffect: {fileID: 5873423488490184862} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: df0018cf06e35f64594f8a3e71e34b37, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -7207,11 +7303,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 9 prefab_DrawEffect: {fileID: 4205399302806765581} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 4c445b5ca73942b42adde2b1381b7b56, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -7320,11 +7418,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 3 prefab_DrawEffect: {fileID: 7633571334989700766} - iconRatio: 0.85 + iconRatio: 0.5 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 4c445b5ca73942b42adde2b1381b7b56, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -7433,11 +7533,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 3 prefab_DrawEffect: {fileID: 4832793209706918115} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 7c6adff169b4892498b97b84f5eab5a4, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -7696,11 +7798,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 15 prefab_DrawEffect: {fileID: 4205399302806765581} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 4c445b5ca73942b42adde2b1381b7b56, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -7813,11 +7917,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 2 prefab_DrawEffect: {fileID: 2404213555508628135} - iconRatio: 0.85 + iconRatio: 0.6 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 7c6adff169b4892498b97b84f5eab5a4, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -8152,10 +8258,12 @@ MonoBehaviour: itemId: 5 prefab_DrawEffect: {fileID: 5873423488490184862} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: df0018cf06e35f64594f8a3e71e34b37, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -8339,11 +8447,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 17 prefab_DrawEffect: {fileID: 4832793209706918115} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 7c6adff169b4892498b97b84f5eab5a4, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -8452,11 +8562,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 6 prefab_DrawEffect: {fileID: 4832793209706918115} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 7c6adff169b4892498b97b84f5eab5a4, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -8641,10 +8753,12 @@ MonoBehaviour: itemId: 21 prefab_DrawEffect: {fileID: 5873423488490184862} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: df0018cf06e35f64594f8a3e71e34b37, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -8753,11 +8867,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 5 prefab_DrawEffect: {fileID: 4205399302806765581} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 4c445b5ca73942b42adde2b1381b7b56, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -8866,11 +8982,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 8 prefab_DrawEffect: {fileID: 2404213555508628135} - iconRatio: 0.85 + iconRatio: 0.6 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 7c6adff169b4892498b97b84f5eab5a4, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -8979,11 +9097,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 4 prefab_DrawEffect: {fileID: 4205399302806765581} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 4c445b5ca73942b42adde2b1381b7b56, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -9168,10 +9288,12 @@ MonoBehaviour: itemId: 13 prefab_DrawEffect: {fileID: 5873423488490184862} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: df0018cf06e35f64594f8a3e71e34b37, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -9280,11 +9402,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 13 prefab_DrawEffect: {fileID: 4832793209706918115} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 7c6adff169b4892498b97b84f5eab5a4, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -9393,11 +9517,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 1 prefab_DrawEffect: {fileID: 4205399302806765581} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 4c445b5ca73942b42adde2b1381b7b56, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -9515,11 +9641,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 3 prefab_DrawEffect: {fileID: 4205399302806765581} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 4c445b5ca73942b42adde2b1381b7b56, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -9628,11 +9756,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 12 prefab_DrawEffect: {fileID: 4205399302806765581} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 4c445b5ca73942b42adde2b1381b7b56, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -9908,11 +10038,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 4 prefab_DrawEffect: {fileID: 7633571334989700766} - iconRatio: 0.85 + iconRatio: 0.5 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 4c445b5ca73942b42adde2b1381b7b56, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -10022,10 +10154,12 @@ MonoBehaviour: itemId: 9 prefab_DrawEffect: {fileID: 5873423488490184862} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: df0018cf06e35f64594f8a3e71e34b37, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -10134,11 +10268,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 15 prefab_DrawEffect: {fileID: 4832793209706918115} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 7c6adff169b4892498b97b84f5eab5a4, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -10248,11 +10384,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 1 prefab_DrawEffect: {fileID: 0} - iconRatio: 0.85 + iconRatio: 0.5 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 4c445b5ca73942b42adde2b1381b7b56, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -10361,11 +10499,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 11 prefab_DrawEffect: {fileID: 4205399302806765581} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 4c445b5ca73942b42adde2b1381b7b56, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -10482,11 +10622,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 2 prefab_DrawEffect: {fileID: 4832793209706918115} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 7c6adff169b4892498b97b84f5eab5a4, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -10595,11 +10737,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 16 prefab_DrawEffect: {fileID: 4832793209706918115} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 7c6adff169b4892498b97b84f5eab5a4, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -10708,11 +10852,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 20 prefab_DrawEffect: {fileID: 4205399302806765581} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 4c445b5ca73942b42adde2b1381b7b56, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -10821,11 +10967,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 7 prefab_DrawEffect: {fileID: 2404213555508628135} - iconRatio: 0.85 + iconRatio: 0.6 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 7c6adff169b4892498b97b84f5eab5a4, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -11055,10 +11203,12 @@ MonoBehaviour: itemId: 2 prefab_DrawEffect: {fileID: 0} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 0} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -11167,11 +11317,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 8 prefab_DrawEffect: {fileID: 4832793209706918115} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 7c6adff169b4892498b97b84f5eab5a4, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -11283,7 +11435,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4939645036088528870 RectTransform: m_ObjectHideFlags: 0 @@ -11489,10 +11641,12 @@ MonoBehaviour: itemId: 19 prefab_DrawEffect: {fileID: 5873423488490184862} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: df0018cf06e35f64594f8a3e71e34b37, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -11604,11 +11758,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 2 prefab_DrawEffect: {fileID: 7633571334989700766} - iconRatio: 0.85 + iconRatio: 0.5 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 4c445b5ca73942b42adde2b1381b7b56, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -11843,11 +11999,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 14 prefab_DrawEffect: {fileID: 4205399302806765581} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 4c445b5ca73942b42adde2b1381b7b56, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -12032,11 +12190,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 2 prefab_DrawEffect: {fileID: 0} - iconRatio: 0.85 + iconRatio: 0.5 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 4c445b5ca73942b42adde2b1381b7b56, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -12146,10 +12306,12 @@ MonoBehaviour: itemId: 18 prefab_DrawEffect: {fileID: 5873423488490184862} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: df0018cf06e35f64594f8a3e71e34b37, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -12485,10 +12647,12 @@ MonoBehaviour: itemId: 11 prefab_DrawEffect: {fileID: 5873423488490184862} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: df0018cf06e35f64594f8a3e71e34b37, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -12997,10 +13161,12 @@ MonoBehaviour: itemId: 23 prefab_DrawEffect: {fileID: 5873423488490184862} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: df0018cf06e35f64594f8a3e71e34b37, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -13185,10 +13351,12 @@ MonoBehaviour: itemId: 3 prefab_DrawEffect: {fileID: 0} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 0} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -13373,10 +13541,12 @@ MonoBehaviour: itemId: 3 prefab_DrawEffect: {fileID: 7810585743848339509} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: df0018cf06e35f64594f8a3e71e34b37, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -13485,11 +13655,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 5 prefab_DrawEffect: {fileID: 7633571334989700766} - iconRatio: 0.85 + iconRatio: 0.5 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 4c445b5ca73942b42adde2b1381b7b56, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -13810,10 +13982,12 @@ MonoBehaviour: itemId: 1 prefab_DrawEffect: {fileID: 7810585743848339509} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: df0018cf06e35f64594f8a3e71e34b37, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -13922,11 +14096,13 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 13 prefab_DrawEffect: {fileID: 4205399302806765581} - iconRatio: 0.85 + iconRatio: 0.7 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: 4c445b5ca73942b42adde2b1381b7b56, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -14036,10 +14212,12 @@ MonoBehaviour: itemId: 22 prefab_DrawEffect: {fileID: 5873423488490184862} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: df0018cf06e35f64594f8a3e71e34b37, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -14149,10 +14327,12 @@ MonoBehaviour: itemId: 3 prefab_DrawEffect: {fileID: 0} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 0} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -14273,10 +14453,12 @@ MonoBehaviour: itemId: 2 prefab_DrawEffect: {fileID: 5873423488490184862} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: df0018cf06e35f64594f8a3e71e34b37, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -14386,10 +14568,12 @@ MonoBehaviour: itemId: 2 prefab_DrawEffect: {fileID: 7810585743848339509} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 21300000, guid: df0018cf06e35f64594f8a3e71e34b37, type: 3} + tmp_Name: {fileID: 0} prize: prizeId: name: @@ -14499,10 +14683,12 @@ MonoBehaviour: itemId: 1 prefab_DrawEffect: {fileID: 0} iconRatio: 0.85 + prizeScale: 1 iconOffsetY: 0 fontSize: 22 drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5} maskSprite: {fileID: 0} + tmp_Name: {fileID: 0} prize: prizeId: name: diff --git a/Assets/MyGame/aa/UI/Home/Sub/Activity/ChouJiangItem.cs b/Assets/MyGame/aa/UI/Home/Sub/Activity/ChouJiangItem.cs index 13e536f5a..02eeb9a7f 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/Activity/ChouJiangItem.cs +++ b/Assets/MyGame/aa/UI/Home/Sub/Activity/ChouJiangItem.cs @@ -25,6 +25,8 @@ public class ChouJiangItem : MonoBehaviour [Header("动态生成参数")] [Tooltip("图标占格子短边的比例")] public float iconRatio = 0.85f; + [Tooltip("奖品大小系数:统一/微调各格子奖品图标的整体大小(1=按 iconRatio,>1 放大 <1 缩小)")] + public float prizeScale = 1f; [Tooltip("图标中心相对格子中心的纵向偏移(0=居中,负数=往下贴)")] public float iconOffsetY = 0f; [Tooltip("数量文本字号")] @@ -36,6 +38,9 @@ public class ChouJiangItem : MonoBehaviour public Sprite maskSprite; [Header("奖励数据(Init 时由代码填充,Play 模式选中物体可实时查看)")] + [Tooltip("道具名字文本(可选):拖 TextMeshProUGUI 才显示名字,留空或名字数据为空则不显示")] + public TextMeshProUGUI tmp_Name; + [Tooltip("道具信息 + 奖励详细信息(prizeId/名称/图标/类型/数量/道具 product/权重/库存)")] public LotteryPrize prize; @@ -76,8 +81,8 @@ public class ChouJiangItem : MonoBehaviour if (maskSprite != null) iconParent = CreateMask(rt, w, h); - // 图标:方形占短边 iconRatio,居中(iconOffsetY 可微调) - float side = Mathf.Min(w, h) * iconRatio; + // 图标:方形占短边 iconRatio × prizeScale(各格子可单独调奖品大小),居中(iconOffsetY 可微调) + float side = Mathf.Min(w, h) * iconRatio * Mathf.Max(0.01f, prizeScale); img_Icon = CreateIcon(iconParent, side); SetPrizeIcon(img_Icon, prize); @@ -85,6 +90,10 @@ public class ChouJiangItem : MonoBehaviour tmp_Count = CreateCountText(rt, w, side); tmp_Count.text = prize.count.ToString(); + // 道具名字(可选):拖了 tmp_Name 才显示,名字数据为空也隐藏 + if (tmp_Name != null) + tmp_Name.text = string.IsNullOrEmpty(prize.name) ? "" : prize.name; + // 新数据默认未抽中,已抽列表由面板 Init 后统一刷新 RefreshDrawnState(false); } diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/XiaoCHouPuKe.mat b/Assets/TextMesh Pro/Resources/Fonts & Materials/XiaoCHouPuKe.mat new file mode 100644 index 000000000..4b30ad4ac --- /dev/null +++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/XiaoCHouPuKe.mat @@ -0,0 +1,195 @@ +%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: XiaoCHouPuKe + m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - GLOW_ON + - UNDERLAY_ON + 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} + - _Cube: + 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} + - _FaceTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: -5242640295693195929, guid: 5d4a713fdd931db4c9ce49f068b54e0a, + type: 2} + 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} + - _OutlineTex: + 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 + - _Ambient: 0.5 + - _Bevel: 0.5 + - _BevelClamp: 0 + - _BevelOffset: 0 + - _BevelRoundness: 0 + - _BevelWidth: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpFace: 0 + - _BumpOutline: 0 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _ColorMask: 15 + - _Cull: 2 + - _CullMode: 0 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _Diffuse: 0.5 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _FaceDilate: 0.132 + - _FaceUVSpeedX: 0 + - _FaceUVSpeedY: 0 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _GlowInner: 0.05 + - _GlowOffset: 0 + - _GlowOuter: 1 + - _GlowPower: 0.5 + - _GradientScale: 4 + - _LightAngle: 3.1416 + - _MaskSoftnessX: 0 + - _MaskSoftnessY: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _OutlineSoftness: 0.117 + - _OutlineUVSpeedX: 0 + - _OutlineUVSpeedY: 0 + - _OutlineWidth: 0 + - _Parallax: 0.005 + - _PerspectiveFilter: 0.875 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Reflectivity: 10 + - _ScaleRatioA: 0.75 + - _ScaleRatioB: 0.08850002 + - _ScaleRatioC: 0.08850002 + - _ScaleX: 1 + - _ScaleY: 1 + - _ShaderFlags: 0 + - _Sharpness: 0 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SpecularPower: 2 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 1 + - _StencilWriteMask: 0 + - _Surface: 0 + - _TextureHeight: 2048 + - _TextureWidth: 4096 + - _UnderlayDilate: 0 + - _UnderlayOffsetX: -0.024 + - _UnderlayOffsetY: 0 + - _UnderlaySoftness: 0.54 + - _VertexOffsetX: 0 + - _VertexOffsetY: 0 + - _WeightBold: 3 + - _WeightNormal: 1.2 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0} + - _FaceColor: {r: 1, g: 1, b: 1, a: 1} + - _GlowColor: {r: 0, g: 0, b: 0, a: 0.5} + - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767} + - _OutlineColor: {r: 0.47353154, g: 0.22322798, b: 0.05448028, a: 1} + - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1} + - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} + - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5} + m_BuildTextureStacks: [] diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/XiaoCHouPuKe.mat.meta b/Assets/TextMesh Pro/Resources/Fonts & Materials/XiaoCHouPuKe.mat.meta new file mode 100644 index 000000000..eddc064ed --- /dev/null +++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/XiaoCHouPuKe.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 97512fd3515f8d44a8f1b990d5648f96 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: