1
This commit is contained in:
@@ -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: []
|
||||
|
||||
+60
-1
@@ -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
|
||||
|
||||
@@ -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
|
||||
/// <summary>根据武器 ID 选择对应的预制体和标签</summary>
|
||||
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);
|
||||
|
||||
@@ -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
|
||||
|
||||
+124
-10
@@ -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
|
||||
|
||||
@@ -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:
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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: []
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 97512fd3515f8d44a8f1b990d5648f96
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user