Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks
This commit is contained in:
commit
bf9940a02a
@ -336,6 +336,8 @@ MonoBehaviour:
|
||||
BulletStartPos: {fileID: 0}
|
||||
AttackSpeed: 1
|
||||
direction: {x: 0, y: 0}
|
||||
roleBulletSpeedAdd: 0
|
||||
BulletNumber: 1
|
||||
--- !u!58 &1338343970434073545
|
||||
CircleCollider2D:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -419,7 +421,7 @@ MonoBehaviour:
|
||||
retbutton: {fileID: 0}
|
||||
ClosureObj: {fileID: 0}
|
||||
id: M_H_001
|
||||
Name:
|
||||
Name: "\u706B\u840C\u5996-01"
|
||||
camp: 0
|
||||
hp: 100
|
||||
dieIndex: -1
|
||||
@ -429,18 +431,19 @@ MonoBehaviour:
|
||||
_Canvas: {fileID: 0}
|
||||
spriteRenderers: {fileID: 0}
|
||||
HurtDirectin: 0
|
||||
Quality:
|
||||
Elements:
|
||||
Info:
|
||||
SkillId:
|
||||
AttackType:
|
||||
AttackActionType:
|
||||
AttackCD: 0
|
||||
CritRate: 0
|
||||
CriticalHitRateBonus: 0
|
||||
Quality: 0
|
||||
Elements: 4
|
||||
Info: "\u5411\u524D\u65B9\u55B7\u5C04\u7EB5\u54112\u683C\u8303\u56F4\u7684\u706B\u7130\uFF0C\u6301\u7EED\u653B\u51FB\u654C\u4EBA\u3002"
|
||||
SkillId: 4001
|
||||
AttackType: 0
|
||||
AttackActionType: 0
|
||||
AttackRange: 2
|
||||
AttackCD: 0.3
|
||||
CritRate: 0.03
|
||||
CriticalHitRateBonus: 0.25
|
||||
gold: 10
|
||||
MaxAttack: 10
|
||||
MinAttack: 10
|
||||
MaxAttack: 5
|
||||
MinAttack: 4
|
||||
physicalArmor: 10
|
||||
magicArmor: 5
|
||||
Navigation: {fileID: 0}
|
||||
@ -455,6 +458,8 @@ MonoBehaviour:
|
||||
hitIndex: 2
|
||||
normalIndex: 0
|
||||
isHit: 0
|
||||
myTags: 0
|
||||
mySkillUp: {fileID: 1061754087244483355}
|
||||
enemyId:
|
||||
moveSpeed: 0
|
||||
harmNumber: 0
|
||||
@ -565,11 +570,16 @@ MonoBehaviour:
|
||||
retbutton: {fileID: 0}
|
||||
ClosureObj: {fileID: 0}
|
||||
role: {fileID: 8433650274028726420}
|
||||
DamageUp: 1
|
||||
AttackRange: 1
|
||||
AttackCooldown: 1
|
||||
AttackDuration: 1
|
||||
NumberOfBullets: 1
|
||||
SpeedOfBullets: 1
|
||||
CritRate: 1
|
||||
DamageOfSky: 1
|
||||
attack: {fileID: 7276635428522831207}
|
||||
attackRange: 0
|
||||
attackCooldown: 0
|
||||
attackDuration: 0
|
||||
numberOfBullets: 0
|
||||
speedOfBullets: 0
|
||||
DamageUp: 0
|
||||
CriticalRate: 0
|
||||
CriticalDamage: 0
|
||||
DamageOfSky: 0
|
||||
DamageOfland: 0
|
||||
DamageOfBig: 0
|
||||
DamageOfMin: 0
|
||||
|
||||
@ -367,6 +367,8 @@ MonoBehaviour:
|
||||
BulletStartPos: {fileID: 2562350995381512747}
|
||||
AttackSpeed: 1
|
||||
direction: {x: 0, y: 0}
|
||||
roleBulletSpeedAdd: 0
|
||||
BulletNumber: 1
|
||||
--- !u!58 &1338343970434073545
|
||||
CircleCollider2D:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -450,7 +452,7 @@ MonoBehaviour:
|
||||
retbutton: {fileID: 0}
|
||||
ClosureObj: {fileID: 0}
|
||||
id: M_M_001
|
||||
Name:
|
||||
Name: "\u6728\u840C\u5996-01"
|
||||
camp: 0
|
||||
hp: 100
|
||||
dieIndex: -1
|
||||
@ -460,18 +462,19 @@ MonoBehaviour:
|
||||
_Canvas: {fileID: 0}
|
||||
spriteRenderers: {fileID: 0}
|
||||
HurtDirectin: 0
|
||||
Quality:
|
||||
Elements:
|
||||
Info:
|
||||
SkillId:
|
||||
AttackType:
|
||||
AttackActionType:
|
||||
AttackCD: 0
|
||||
CritRate: 0
|
||||
Quality: 0
|
||||
Elements: 2
|
||||
Info: "\u5F53\u653B\u51FB\u8303\u56F4\u5185\u51FA\u73B0\u654C\u4EBA\u540E\u5C31\u4F1A\u9501\u5B9A\u654C\u4EBA\uFF0C\u7136\u540E\u6301\u7EED\u5C04\u51FA\u5B50\u5F39\u8FDB\u884C\u653B\u51FB\u3002"
|
||||
SkillId: 2001
|
||||
AttackType: 0
|
||||
AttackActionType: 0
|
||||
AttackRange: 6
|
||||
AttackCD: 0.6
|
||||
CritRate: 0.065
|
||||
CriticalHitRateBonus: 0
|
||||
gold: 10
|
||||
MaxAttack: 10
|
||||
MinAttack: 10
|
||||
MaxAttack: 6
|
||||
MinAttack: 4
|
||||
physicalArmor: 10
|
||||
magicArmor: 5
|
||||
Navigation: {fileID: 0}
|
||||
@ -486,6 +489,8 @@ MonoBehaviour:
|
||||
hitIndex: 2
|
||||
normalIndex: 0
|
||||
isHit: 0
|
||||
myTags: 0
|
||||
mySkillUp: {fileID: 3258498600701209889}
|
||||
enemyId:
|
||||
moveSpeed: 0
|
||||
harmNumber: 0
|
||||
@ -544,12 +549,13 @@ MonoBehaviour:
|
||||
retbutton: {fileID: 0}
|
||||
ClosureObj: {fileID: 0}
|
||||
role: {fileID: 8433650274028726420}
|
||||
attack: {fileID: 7276635428522831207}
|
||||
attackRange: 0
|
||||
attackCooldown: 0
|
||||
attackDuration: 0
|
||||
numberOfBullets: 0
|
||||
speedOfBullets: 0
|
||||
DamageUp: 0
|
||||
AttackRange: 0
|
||||
AttackCooldown: 0
|
||||
AttackDuration: 0
|
||||
NumberOfBullets: 0
|
||||
SpeedOfBullets: 0
|
||||
CriticalRate: 0
|
||||
CriticalDamage: 0
|
||||
DamageOfSky: 0
|
||||
|
||||
@ -367,6 +367,8 @@ MonoBehaviour:
|
||||
BulletStartPos: {fileID: 5621354293604444993}
|
||||
AttackSpeed: 1
|
||||
direction: {x: 0, y: 0}
|
||||
roleBulletSpeedAdd: 0
|
||||
BulletNumber: 1
|
||||
--- !u!58 &1338343970434073545
|
||||
CircleCollider2D:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -450,7 +452,7 @@ MonoBehaviour:
|
||||
retbutton: {fileID: 0}
|
||||
ClosureObj: {fileID: 0}
|
||||
id: M_S_001
|
||||
Name:
|
||||
Name: "\u6C34\u840C\u5996-01"
|
||||
camp: 0
|
||||
hp: 100
|
||||
dieIndex: -1
|
||||
@ -460,18 +462,19 @@ MonoBehaviour:
|
||||
_Canvas: {fileID: 0}
|
||||
spriteRenderers: {fileID: 0}
|
||||
HurtDirectin: 0
|
||||
Quality:
|
||||
Elements:
|
||||
Info:
|
||||
SkillId:
|
||||
AttackType:
|
||||
AttackActionType:
|
||||
AttackCD: 0
|
||||
CritRate: 0
|
||||
Quality: 0
|
||||
Elements: 3
|
||||
Info: "\u5C04\u51FA\u51B0\u51BB\u5B50\u5F39\uFF0C\u547D\u4E2D\u540E\u4F1A\u964D\u4F4E\u654C\u4EBA\u79FB\u52A8\u901F\u5EA6\u3002"
|
||||
SkillId: 3001
|
||||
AttackType: 0
|
||||
AttackActionType: 0
|
||||
AttackRange: 5
|
||||
AttackCD: 1
|
||||
CritRate: 0.05
|
||||
CriticalHitRateBonus: 0
|
||||
gold: 10
|
||||
MaxAttack: 10
|
||||
MinAttack: 10
|
||||
MinAttack: 7
|
||||
physicalArmor: 10
|
||||
magicArmor: 5
|
||||
Navigation: {fileID: 0}
|
||||
@ -486,6 +489,8 @@ MonoBehaviour:
|
||||
hitIndex: 2
|
||||
normalIndex: 0
|
||||
isHit: 0
|
||||
myTags: 0
|
||||
mySkillUp: {fileID: 206052671066122143}
|
||||
enemyId:
|
||||
moveSpeed: 0
|
||||
harmNumber: 0
|
||||
@ -544,12 +549,13 @@ MonoBehaviour:
|
||||
retbutton: {fileID: 0}
|
||||
ClosureObj: {fileID: 0}
|
||||
role: {fileID: 8433650274028726420}
|
||||
attack: {fileID: 7276635428522831207}
|
||||
attackRange: 0
|
||||
attackCooldown: 0
|
||||
attackDuration: 0
|
||||
numberOfBullets: 0
|
||||
speedOfBullets: 0
|
||||
DamageUp: 0
|
||||
AttackRange: 0
|
||||
AttackCooldown: 0
|
||||
AttackDuration: 0
|
||||
NumberOfBullets: 0
|
||||
SpeedOfBullets: 0
|
||||
CriticalRate: 0
|
||||
CriticalDamage: 0
|
||||
DamageOfSky: 0
|
||||
|
||||
@ -890,9 +890,9 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 0}
|
||||
m_Sprite: {fileID: 21300000, guid: a08c0bbc88347fe4eae0f2f3bd567189, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_PreserveAspect: 1
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
@ -1021,7 +1021,7 @@ MonoBehaviour:
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u51FA\u6218"
|
||||
m_Text: "\u5C55\u793A"
|
||||
--- !u!1 &8729994381410932161
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1142,19 +1142,7 @@ MonoBehaviour:
|
||||
m_TargetGraphic: {fileID: 1714874798090712099}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 8961164595193340455}
|
||||
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
|
||||
m_MethodName: SetActive
|
||||
m_Mode: 6
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 1
|
||||
m_CallState: 2
|
||||
m_Calls: []
|
||||
--- !u!1 &8961164595193340455
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1174,7 +1162,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &6450136304373507703
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1291,3 +1279,5 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
id: 0
|
||||
lottery: {fileID: 0}
|
||||
showBtn: {fileID: 4173642057463196963}
|
||||
|
||||
@ -4682,11 +4682,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 234
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 300
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -4966,11 +4966,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 234
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 300
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -5176,11 +5176,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 234
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 300
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -6781,7 +6781,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6931136037450377240, guid: e80ddc32e04c4a44eaeabc0e8937a298, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 187.20605
|
||||
value: -723.68835
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6931136037576709270, guid: e80ddc32e04c4a44eaeabc0e8937a298, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
@ -8133,11 +8133,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 234
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 300
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -21091,9 +21091,9 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_Maskable: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -29364,11 +29364,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 234
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 300
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -29868,11 +29868,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 234
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 300
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -33372,11 +33372,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 234
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 300
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -43499,9 +43499,8 @@ GameObject:
|
||||
- component: {fileID: 512938723}
|
||||
- component: {fileID: 512938726}
|
||||
- component: {fileID: 512938725}
|
||||
- component: {fileID: 512938724}
|
||||
m_Layer: 5
|
||||
m_Name: AddBtn
|
||||
m_Name: AddImage
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -43518,7 +43517,8 @@ RectTransform:
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Children:
|
||||
- {fileID: 1403831418}
|
||||
m_Father: {fileID: 1983958458}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@ -43527,50 +43527,6 @@ RectTransform:
|
||||
m_AnchoredPosition: {x: 19, y: -16}
|
||||
m_SizeDelta: {x: 38, y: 40}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &512938724
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 512938722}
|
||||
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: 512938725}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!114 &512938725
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -43593,7 +43549,7 @@ MonoBehaviour:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: d44ec2abec00f6041aed2a04d366f7ea, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_PreserveAspect: 1
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
@ -50108,8 +50064,8 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: fd438b9208902154986a2653a8ea305c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Genbtn: {fileID: 512938724}
|
||||
WaterBtn: {fileID: 1151648667}
|
||||
Genbtn: {fileID: 1403831419}
|
||||
WaterBtn: {fileID: 2105530678}
|
||||
GemText: {fileID: 2085121787}
|
||||
WaterText: {fileID: 250749855}
|
||||
mygameObject: {fileID: 1553952863}
|
||||
@ -59672,11 +59628,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 234
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 300
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -62508,11 +62464,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 234
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 300
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -66123,7 +66079,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8631885452844930979, guid: 638b7f7423db411419568d073208d929, type: 3}
|
||||
propertyPath: m_Text
|
||||
value: "\u517B\u6210"
|
||||
value: "\u953B\u9020"
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 1906224345288813973, guid: 638b7f7423db411419568d073208d929, type: 3}
|
||||
@ -82363,32 +82319,56 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
|
||||
value: 1
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
|
||||
value: 6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
|
||||
value:
|
||||
objectReference: {fileID: 1254123838}
|
||||
- target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
|
||||
value:
|
||||
objectReference: {fileID: 1254123840}
|
||||
- target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
|
||||
value: SetActive
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
|
||||
value: CloseBtnClick
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
|
||||
value: UnityEngine.GameObject, UnityEngine
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName
|
||||
value: Lottery, Assembly-CSharp
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
|
||||
value: UnityEngine.Object, UnityEngine
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName
|
||||
value: UnityEngine.Object, UnityEngine
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
@ -82904,8 +82884,8 @@ RectTransform:
|
||||
m_GameObject: {fileID: 1017461336}
|
||||
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_LocalScale: {x: 1.3, y: 1.3, z: 1.3}
|
||||
m_ConstrainProportionsScale: 1
|
||||
m_Children:
|
||||
- {fileID: 12423522}
|
||||
- {fileID: 1044695227}
|
||||
@ -82914,7 +82894,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 159, y: -70}
|
||||
m_AnchoredPosition: {x: 188, y: -82}
|
||||
m_SizeDelta: {x: 244, y: 66}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1017461338
|
||||
@ -93719,9 +93699,8 @@ GameObject:
|
||||
- component: {fileID: 1151648666}
|
||||
- component: {fileID: 1151648669}
|
||||
- component: {fileID: 1151648668}
|
||||
- component: {fileID: 1151648667}
|
||||
m_Layer: 5
|
||||
m_Name: AddBtn
|
||||
m_Name: AddImage
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -93738,7 +93717,8 @@ RectTransform:
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Children:
|
||||
- {fileID: 2105530677}
|
||||
m_Father: {fileID: 315580080}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@ -93747,50 +93727,6 @@ RectTransform:
|
||||
m_AnchoredPosition: {x: 19, y: -16}
|
||||
m_SizeDelta: {x: 38, y: 40}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1151648667
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1151648665}
|
||||
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: 1151648668}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!114 &1151648668
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -101751,6 +101687,8 @@ MonoBehaviour:
|
||||
- {fileID: 21300000, guid: 9fa0104204241e84291b15ca8123db4b, type: 3}
|
||||
- {fileID: 21300000, guid: 42da5448d7cb6d14a98ddcb4a57619a6, type: 3}
|
||||
- {fileID: 21300000, guid: ffc65c033e3f4594d960ed2009726cad, type: 3}
|
||||
fightinglist: []
|
||||
ClosefightingBtn: {fileID: 2071404938}
|
||||
--- !u!1 &1255728799
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -107966,11 +107904,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 234
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 300
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -110285,11 +110223,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 234
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 300
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -111094,11 +111032,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 234
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 300
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -112760,6 +112698,127 @@ SpriteRenderer:
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1 &1403831417
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1403831418}
|
||||
- component: {fileID: 1403831421}
|
||||
- component: {fileID: 1403831420}
|
||||
- component: {fileID: 1403831419}
|
||||
m_Layer: 5
|
||||
m_Name: Addbtn
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1403831418
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1403831417}
|
||||
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: 512938723}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 62.1855, y: 15.1518}
|
||||
m_SizeDelta: {x: 146.371, y: 38.4963}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1403831419
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1403831417}
|
||||
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: 1403831420}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!114 &1403831420
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1403831417}
|
||||
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: 0}
|
||||
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: 10905, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Type: 1
|
||||
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!222 &1403831421
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1403831417}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1406206945
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -114720,11 +114779,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 234
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 300
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -117970,11 +118029,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 234
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 300
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -129262,11 +129321,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 234
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 300
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -140884,11 +140943,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 234
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 300
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -149867,11 +149926,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 234
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 300
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -153556,11 +153615,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 234
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 300
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -155677,11 +155736,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 234
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 300
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -161587,11 +161646,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 234
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 300
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -164127,11 +164186,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 234
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 300
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -165460,11 +165519,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 234
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 300
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -166908,6 +166967,7 @@ GameObject:
|
||||
- component: {fileID: 2071404935}
|
||||
- component: {fileID: 2071404937}
|
||||
- component: {fileID: 2071404936}
|
||||
- component: {fileID: 2071404938}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
@ -166974,6 +167034,50 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2071404934}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &2071404938
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2071404934}
|
||||
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: 1, g: 1, b: 1, 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: 2071404936}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &2072215373
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -167846,11 +167950,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 234
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 300
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3625754743905974222, guid: b7cbb10f500e36c4da6382d867335073, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -168044,9 +168148,9 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_Maskable: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -169930,6 +170034,128 @@ MonoBehaviour:
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
--- !u!1 &2105530676
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2105530677}
|
||||
- component: {fileID: 2105530680}
|
||||
- component: {fileID: 2105530679}
|
||||
- component: {fileID: 2105530678}
|
||||
m_Layer: 5
|
||||
m_Name: AddBtn
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2105530677
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2105530676}
|
||||
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: 2109728512}
|
||||
m_Father: {fileID: 1151648666}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 67.75, y: 15.6704}
|
||||
m_SizeDelta: {x: 135.5, y: 40.2806}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &2105530678
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2105530676}
|
||||
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: 2105530679}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!114 &2105530679
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2105530676}
|
||||
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: 0}
|
||||
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: 10905, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Type: 1
|
||||
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!222 &2105530680
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2105530676}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &2107193547
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -170040,6 +170266,86 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2109521902}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &2109728511
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2109728512}
|
||||
- component: {fileID: 2109728514}
|
||||
- component: {fileID: 2109728513}
|
||||
m_Layer: 5
|
||||
m_Name: Text (Legacy)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2109728512
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2109728511}
|
||||
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: 2105530677}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &2109728513
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2109728511}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData:
|
||||
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_FontSize: 14
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 10
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: Button
|
||||
--- !u!222 &2109728514
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2109728511}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &2110065387
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit ae2c0eddc422acc6360ade1f051cf4df8d32d5ea
|
||||
Subproject commit 8da1a9bd84b59b84fa7154c08df416dfd4091b9a
|
||||
@ -5,21 +5,78 @@ using UnityEngine;
|
||||
|
||||
public class SkillUp : Fun
|
||||
{
|
||||
[Header("基类")] public Role role;
|
||||
|
||||
[Header("攻击伤害加成")] public float DamageUp=0f;
|
||||
[Header("攻击范围加成")] public float AttackRange = 0f;
|
||||
[Header("攻击冷却加成")] public float AttackCooldown = 0f;
|
||||
[Header("攻击持续时间加成")] public float AttackDuration = 0f;
|
||||
[Header("攻击子弹数量加成")] public int NumberOfBullets = 0;
|
||||
[Header("攻击子弹速度加成")] public float SpeedOfBullets = 0f;
|
||||
[Header("暴击率倍率加成")]public float CriticalRate = 0f;
|
||||
[Header("暴击伤害倍率加成")]public float CriticalDamage = 0f;
|
||||
[Header("角色脚本")] public Role role;
|
||||
[Header("攻击脚本")]public Attack attack;
|
||||
|
||||
[Header("对空伤害加成")] public float DamageOfSky = 0f;
|
||||
[Header("对地伤害加成")] public float DamageOfland = 0f;
|
||||
[Header("对大型敌人加成")] public float DamageOfBig = 0f;
|
||||
[Header("对小型型敌人加成")] public float DamageOfMin = 0f;
|
||||
[HideInInspector][Header("攻击范围加成")] public float attackRange = 0f;
|
||||
[HideInInspector]
|
||||
public float AttackRange
|
||||
{
|
||||
get=> attackRange;
|
||||
set
|
||||
{
|
||||
attackRange=value;
|
||||
role.AttackRange *=(1+ attackRange);
|
||||
}
|
||||
}
|
||||
|
||||
[HideInInspector][Header("攻击冷却加成")] public float attackCooldown = 0f;
|
||||
[HideInInspector]
|
||||
public float AttackCooldown
|
||||
{
|
||||
get => attackCooldown;
|
||||
set
|
||||
{
|
||||
attackCooldown = value;
|
||||
role.AttackCD *= (1 + attackCooldown);
|
||||
}
|
||||
}
|
||||
|
||||
[HideInInspector][Header("攻击持续时间加成")] public float attackDuration = 0f;
|
||||
|
||||
[HideInInspector]
|
||||
public float AttackDuration
|
||||
{
|
||||
get => attackDuration;
|
||||
set
|
||||
{
|
||||
attackDuration = value;
|
||||
}
|
||||
}
|
||||
[HideInInspector][Header("攻击子弹数量加成")] public int numberOfBullets = 0;
|
||||
|
||||
[HideInInspector]
|
||||
public int NumberOfBullets
|
||||
{
|
||||
get => numberOfBullets;
|
||||
set
|
||||
{
|
||||
numberOfBullets = value;
|
||||
attack.BulletNumber += numberOfBullets;
|
||||
}
|
||||
}
|
||||
[HideInInspector][Header("攻击子弹速度加成")] public float speedOfBullets = 0f;
|
||||
[HideInInspector]
|
||||
public float SpeedOfBullets
|
||||
{
|
||||
get => speedOfBullets;
|
||||
set
|
||||
{
|
||||
speedOfBullets = value;
|
||||
attack.roleBulletSpeedAdd = speedOfBullets;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
[HideInInspector][Header("攻击伤害加成")] public float DamageUp = 0f;
|
||||
[HideInInspector][Header("暴击率倍率加成")]public float CriticalRate = 0f;
|
||||
[HideInInspector][Header("暴击伤害倍率加成")]public float CriticalDamage = 0f;
|
||||
|
||||
[HideInInspector][Header("对空伤害加成")] public float DamageOfSky = 0f;
|
||||
[HideInInspector][Header("对地伤害加成")] public float DamageOfland = 0f;
|
||||
[HideInInspector][Header("对大型敌人加成")] public float DamageOfBig = 0f;
|
||||
[HideInInspector][Header("对小型型敌人加成")] public float DamageOfMin = 0f;
|
||||
|
||||
// 存储技能加成效果
|
||||
private Dictionary<string, Dictionary<int, System.Action>> skillUpgrades = new Dictionary<string, Dictionary<int, System.Action>>();
|
||||
|
||||
@ -11,21 +11,35 @@ public class Lottery : MonoBehaviour
|
||||
public Transform Connect;
|
||||
|
||||
public List<Sprite> petsp = new List<Sprite>();
|
||||
public List<PetFightingBtn> fightinglist = new List<PetFightingBtn>();
|
||||
public Button ClosefightingBtn;
|
||||
|
||||
async void Start()
|
||||
{
|
||||
LotteryBtn.onClick.AddListener(LotteryClick);
|
||||
ClosefightingBtn.onClick.AddListener(CloseBtnClick);
|
||||
Update_itemClick();
|
||||
}
|
||||
|
||||
public void CloseBtnClick()//隐藏所有展示item的btn
|
||||
{
|
||||
foreach (PetFightingBtn btn in fightinglist)
|
||||
{
|
||||
btn.gameObject.SetActive(false);
|
||||
}
|
||||
}
|
||||
|
||||
async void Update_itemClick()
|
||||
{
|
||||
PetHome info = await Scene_main_jiekou.instance.getPetHomes();
|
||||
for (int i = 0; i < info.data.items.Count; i++)
|
||||
for (int i = 0; i < info.data.items.Count; i++)//给宠物卡片的item传输id，名字，头像以及将动态生成的卡片的隐藏的方法传过去
|
||||
{
|
||||
GameObject obj = GameObject.Instantiate(petItem, Connect);
|
||||
obj.GetComponent<PetCard>().petName.text = info.data.items[i].name;
|
||||
obj.GetComponent<PetCard>().petFightingBtn.id = info.data.items[i].id;
|
||||
obj.GetComponent<PetCard>().petimage.sprite = showSprite(info.data.items[i].name);
|
||||
obj.GetComponent<PetCard>().petFightingBtn.lottery = this;
|
||||
fightinglist.Add(obj.GetComponent<PetCard>().petFightingBtn);
|
||||
}
|
||||
}
|
||||
|
||||
@ -83,6 +97,7 @@ public class Lottery : MonoBehaviour
|
||||
Update_itemClick();
|
||||
TreeInfo info = await Scene_main_jiekou.instance.TreeInfoS();
|
||||
WaterPanel.instance.Updated_water(info);
|
||||
|
||||
Debug.Log(response);
|
||||
}
|
||||
else
|
||||
|
||||
@ -6,10 +6,22 @@ public class PetFightingBtn : MonoBehaviour
|
||||
{
|
||||
Button figntBtn;
|
||||
public int id;
|
||||
|
||||
public Lottery lottery;
|
||||
public Button showBtn;
|
||||
void Start()
|
||||
{
|
||||
figntBtn = GetComponent<Button>();
|
||||
figntBtn.onClick.AddListener(fightClick);
|
||||
showBtn.onClick.AddListener(showbtnClick);
|
||||
figntBtn.gameObject.SetActive(false);
|
||||
}
|
||||
|
||||
void showbtnClick()
|
||||
{
|
||||
lottery.CloseBtnClick();
|
||||
|
||||
figntBtn.gameObject.SetActive(true);
|
||||
}
|
||||
|
||||
async void fightClick()
|
||||
@ -20,6 +32,7 @@ public class PetFightingBtn : MonoBehaviour
|
||||
petBettleInfoResponse petinfo = await Scene_main_jiekou.instance.getPetBettleInfos();
|
||||
WaterPanel.instance.Updated_petinfo(petinfo);
|
||||
this.gameObject.SetActive(false);
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Net.NetworkInformation;
|
||||
using System.Runtime.CompilerServices;
|
||||
using Newtonsoft.Json;
|
||||
using UnityEngine;
|
||||
using UnityEngine.SceneManagement;
|
||||
@ -172,7 +173,7 @@ public class Logo_in : mount
|
||||
});
|
||||
}
|
||||
|
||||
public void login_Password_screen(string Account) //쵱쯤되쩌썹충
|
||||
public void login_Password_screen(GameObject Accountobj,string Account) //쵱쯤되쩌썹충
|
||||
{
|
||||
|
||||
List<BoxType> boxTypes = new List<BoxType>();
|
||||
@ -192,7 +193,6 @@ public class Logo_in : mount
|
||||
{
|
||||
if (type == 0)
|
||||
{
|
||||
|
||||
gameObject.GetComponent<input_box_pop_up_window>().destroy();
|
||||
}
|
||||
else if (type == 1)
|
||||
@ -204,7 +204,8 @@ public class Logo_in : mount
|
||||
|
||||
if (apifox.code == 200)
|
||||
{
|
||||
gameObject.SetActive(false);
|
||||
Accountobj.GetComponent<input_box_pop_up_window>().destroy();
|
||||
gameObject.GetComponent<input_box_pop_up_window>().destroy();
|
||||
Promptmgr.Instance.PromptBubble("µÇ¼³É¹¦");
|
||||
sceneslider.gameObject.SetActive(true);
|
||||
StartCoroutine(jiaLoading());
|
||||
@ -255,7 +256,7 @@ public class Logo_in : mount
|
||||
if (type == 1)
|
||||
{
|
||||
|
||||
login_Password_screen(boxTypes[0].content);
|
||||
login_Password_screen(gameObject,boxTypes[0].content);
|
||||
//gameObject.GetComponent<input_box_pop_up_window>().destroy();
|
||||
}
|
||||
});
|
||||
|
||||
Loading…
Reference in New Issue
Block a user