diff --git a/assets/resources/game/heros/animtor/up.anim b/assets/resources/game/heros/animtor/up.anim
index 44de1f2c..96170963 100644
--- a/assets/resources/game/heros/animtor/up.anim
+++ b/assets/resources/game/heros/animtor/up.anim
@@ -11,21 +11,18 @@
"speed": 1,
"wrapMode": 2,
"enableTrsBlending": false,
- "_duration": 0.6,
+ "_duration": 1.3333333333333333,
"_hash": 500763545,
"_tracks": [
{
"__id__": 1
- },
- {
- "__id__": 11
}
],
"_exoticAnimation": null,
"_events": [],
"_embeddedPlayers": [],
"_additiveSettings": {
- "__id__": 22
+ "__id__": 11
},
"_auxiliaryCurveEntries": []
},
@@ -70,7 +67,8 @@
"__type__": "cc.RealCurve",
"_times": [
0,
- 0.6
+ 0.6000000238418579,
+ 1.3333333730697632
],
"_values": [
{
@@ -100,6 +98,20 @@
"__editorExtras__": {
"broken": null
}
+ },
+ {
+ "__type__": "cc.RealKeyframeValue",
+ "interpolationMode": 0,
+ "tangentWeightMode": 0,
+ "value": 0,
+ "rightTangent": 0,
+ "rightTangentWeight": 1,
+ "leftTangent": 0,
+ "leftTangentWeight": 1,
+ "easingMethod": 0,
+ "__editorExtras__": {
+ "tangentMode": 0
+ }
}
],
"preExtrapolation": 1,
@@ -115,7 +127,8 @@
"__type__": "cc.RealCurve",
"_times": [
0,
- 0.6
+ 0.6000000238418579,
+ 1.3333333730697632
],
"_values": [
{
@@ -145,6 +158,20 @@
"__editorExtras__": {
"broken": null
}
+ },
+ {
+ "__type__": "cc.RealKeyframeValue",
+ "interpolationMode": 0,
+ "tangentWeightMode": 0,
+ "value": 0,
+ "rightTangent": 0,
+ "rightTangentWeight": 1,
+ "leftTangent": 0,
+ "leftTangentWeight": 1,
+ "easingMethod": 0,
+ "__editorExtras__": {
+ "tangentMode": 0
+ }
}
],
"preExtrapolation": 1,
@@ -160,7 +187,8 @@
"__type__": "cc.RealCurve",
"_times": [
0,
- 0.6
+ 0.6000000238418579,
+ 1.3333333730697632
],
"_values": [
{
@@ -190,6 +218,20 @@
"__editorExtras__": {
"broken": null
}
+ },
+ {
+ "__type__": "cc.RealKeyframeValue",
+ "interpolationMode": 0,
+ "tangentWeightMode": 0,
+ "value": 0,
+ "rightTangent": 0,
+ "rightTangentWeight": 1,
+ "leftTangent": 0,
+ "leftTangentWeight": 1,
+ "easingMethod": 0,
+ "__editorExtras__": {
+ "tangentMode": 0
+ }
}
],
"preExtrapolation": 1,
@@ -208,327 +250,6 @@
"preExtrapolation": 1,
"postExtrapolation": 1
},
- {
- "__type__": "cc.animation.ColorTrack",
- "_binding": {
- "__type__": "cc.animation.TrackBinding",
- "path": {
- "__id__": 12
- },
- "proxy": null
- },
- "_channels": [
- {
- "__id__": 14
- },
- {
- "__id__": 16
- },
- {
- "__id__": 18
- },
- {
- "__id__": 20
- }
- ]
- },
- {
- "__type__": "cc.animation.TrackPath",
- "_paths": [
- {
- "__id__": 13
- },
- "color"
- ]
- },
- {
- "__type__": "cc.animation.ComponentPath",
- "component": "cc.Sprite"
- },
- {
- "__type__": "cc.animation.Channel",
- "_curve": {
- "__id__": 15
- }
- },
- {
- "__type__": "cc.RealCurve",
- "_times": [
- 0,
- 0.06666666666666667,
- 0.4,
- 0.6
- ],
- "_values": [
- {
- "__type__": "cc.RealKeyframeValue",
- "interpolationMode": 0,
- "tangentWeightMode": 0,
- "value": 255,
- "rightTangent": 0,
- "rightTangentWeight": 1,
- "leftTangent": 0,
- "leftTangentWeight": 1,
- "easingMethod": 0,
- "__editorExtras__": {
- "broken": null
- }
- },
- {
- "__type__": "cc.RealKeyframeValue",
- "interpolationMode": 0,
- "tangentWeightMode": 0,
- "value": 255,
- "rightTangent": 0,
- "rightTangentWeight": 1,
- "leftTangent": 0,
- "leftTangentWeight": 1,
- "easingMethod": 0,
- "__editorExtras__": null
- },
- {
- "__type__": "cc.RealKeyframeValue",
- "interpolationMode": 0,
- "tangentWeightMode": 0,
- "value": 255,
- "rightTangent": 0,
- "rightTangentWeight": 1,
- "leftTangent": 0,
- "leftTangentWeight": 1,
- "easingMethod": 0,
- "__editorExtras__": null
- },
- {
- "__type__": "cc.RealKeyframeValue",
- "interpolationMode": 0,
- "tangentWeightMode": 0,
- "value": 255,
- "rightTangent": 0,
- "rightTangentWeight": 1,
- "leftTangent": 0,
- "leftTangentWeight": 1,
- "easingMethod": 0,
- "__editorExtras__": {
- "broken": null
- }
- }
- ],
- "preExtrapolation": 1,
- "postExtrapolation": 1
- },
- {
- "__type__": "cc.animation.Channel",
- "_curve": {
- "__id__": 17
- }
- },
- {
- "__type__": "cc.RealCurve",
- "_times": [
- 0,
- 0.06666666666666667,
- 0.4,
- 0.6
- ],
- "_values": [
- {
- "__type__": "cc.RealKeyframeValue",
- "interpolationMode": 0,
- "tangentWeightMode": 0,
- "value": 194,
- "rightTangent": 0,
- "rightTangentWeight": 1,
- "leftTangent": 0,
- "leftTangentWeight": 1,
- "easingMethod": 0,
- "__editorExtras__": {
- "broken": null
- }
- },
- {
- "__type__": "cc.RealKeyframeValue",
- "interpolationMode": 0,
- "tangentWeightMode": 0,
- "value": 194,
- "rightTangent": 0,
- "rightTangentWeight": 1,
- "leftTangent": 0,
- "leftTangentWeight": 1,
- "easingMethod": 0,
- "__editorExtras__": null
- },
- {
- "__type__": "cc.RealKeyframeValue",
- "interpolationMode": 0,
- "tangentWeightMode": 0,
- "value": 194,
- "rightTangent": 0,
- "rightTangentWeight": 1,
- "leftTangent": 0,
- "leftTangentWeight": 1,
- "easingMethod": 0,
- "__editorExtras__": null
- },
- {
- "__type__": "cc.RealKeyframeValue",
- "interpolationMode": 0,
- "tangentWeightMode": 0,
- "value": 194,
- "rightTangent": 0,
- "rightTangentWeight": 1,
- "leftTangent": 0,
- "leftTangentWeight": 1,
- "easingMethod": 0,
- "__editorExtras__": {
- "broken": null
- }
- }
- ],
- "preExtrapolation": 1,
- "postExtrapolation": 1
- },
- {
- "__type__": "cc.animation.Channel",
- "_curve": {
- "__id__": 19
- }
- },
- {
- "__type__": "cc.RealCurve",
- "_times": [
- 0,
- 0.06666666666666667,
- 0.4,
- 0.6
- ],
- "_values": [
- {
- "__type__": "cc.RealKeyframeValue",
- "interpolationMode": 0,
- "tangentWeightMode": 0,
- "value": 0,
- "rightTangent": 0,
- "rightTangentWeight": 1,
- "leftTangent": 0,
- "leftTangentWeight": 1,
- "easingMethod": 0,
- "__editorExtras__": {
- "broken": null
- }
- },
- {
- "__type__": "cc.RealKeyframeValue",
- "interpolationMode": 0,
- "tangentWeightMode": 0,
- "value": 0,
- "rightTangent": 0,
- "rightTangentWeight": 1,
- "leftTangent": 0,
- "leftTangentWeight": 1,
- "easingMethod": 0,
- "__editorExtras__": null
- },
- {
- "__type__": "cc.RealKeyframeValue",
- "interpolationMode": 0,
- "tangentWeightMode": 0,
- "value": 0,
- "rightTangent": 0,
- "rightTangentWeight": 1,
- "leftTangent": 0,
- "leftTangentWeight": 1,
- "easingMethod": 0,
- "__editorExtras__": null
- },
- {
- "__type__": "cc.RealKeyframeValue",
- "interpolationMode": 0,
- "tangentWeightMode": 0,
- "value": 0,
- "rightTangent": 0,
- "rightTangentWeight": 1,
- "leftTangent": 0,
- "leftTangentWeight": 1,
- "easingMethod": 0,
- "__editorExtras__": {
- "broken": null
- }
- }
- ],
- "preExtrapolation": 1,
- "postExtrapolation": 1
- },
- {
- "__type__": "cc.animation.Channel",
- "_curve": {
- "__id__": 21
- }
- },
- {
- "__type__": "cc.RealCurve",
- "_times": [
- 0,
- 0.06666666666666667,
- 0.4,
- 0.6
- ],
- "_values": [
- {
- "__type__": "cc.RealKeyframeValue",
- "interpolationMode": 0,
- "tangentWeightMode": 0,
- "value": 122,
- "rightTangent": 0,
- "rightTangentWeight": 1,
- "leftTangent": 0,
- "leftTangentWeight": 1,
- "easingMethod": 0,
- "__editorExtras__": {
- "broken": null
- }
- },
- {
- "__type__": "cc.RealKeyframeValue",
- "interpolationMode": 0,
- "tangentWeightMode": 0,
- "value": 255,
- "rightTangent": 0,
- "rightTangentWeight": 1,
- "leftTangent": 0,
- "leftTangentWeight": 1,
- "easingMethod": 0,
- "__editorExtras__": null
- },
- {
- "__type__": "cc.RealKeyframeValue",
- "interpolationMode": 0,
- "tangentWeightMode": 0,
- "value": 248,
- "rightTangent": 0,
- "rightTangentWeight": 1,
- "leftTangent": 0,
- "leftTangentWeight": 1,
- "easingMethod": 0,
- "__editorExtras__": null
- },
- {
- "__type__": "cc.RealKeyframeValue",
- "interpolationMode": 0,
- "tangentWeightMode": 0,
- "value": 0,
- "rightTangent": 0,
- "rightTangentWeight": 1,
- "leftTangent": 0,
- "leftTangentWeight": 1,
- "easingMethod": 0,
- "__editorExtras__": {
- "broken": null
- }
- }
- ],
- "preExtrapolation": 1,
- "postExtrapolation": 1
- },
{
"__type__": "cc.AnimationClipAdditiveSettings",
"enabled": false,
diff --git a/assets/resources/gui/element/cHero.prefab b/assets/resources/gui/element/cHero.prefab
index 6aa330cc..db5c44ce 100644
--- a/assets/resources/gui/element/cHero.prefab
+++ b/assets/resources/gui/element/cHero.prefab
@@ -4109,7 +4109,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 215,
- "height": 18.9
+ "height": 26.46
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -4134,11 +4134,11 @@
"__prefab": {
"__id__": 274
},
- "_lineHeight": 15,
+ "_lineHeight": 21,
"_string": "RichText",
"_horizontalAlign": 0,
"_verticalAlign": 0,
- "_fontSize": 16,
+ "_fontSize": 20,
"_fontColor": {
"__type__": "cc.Color",
"r": 255,
diff --git a/assets/resources/gui/element/cardlite.prefab b/assets/resources/gui/element/cardlite.prefab
index 711ea756..0677f3d0 100644
--- a/assets/resources/gui/element/cardlite.prefab
+++ b/assets/resources/gui/element/cardlite.prefab
@@ -2200,7 +2200,7 @@
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": -45.138,
+ "x": -42,
"y": 0,
"z": 0
},
@@ -2213,8 +2213,8 @@
},
"_lscale": {
"__type__": "cc.Vec3",
- "x": 0.45,
- "y": 0.45,
+ "x": 0.3,
+ "y": 0.3,
"z": 1
},
"_mobility": 0,
@@ -2241,8 +2241,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 64,
- "height": 66
+ "width": 102,
+ "height": 107
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -2272,13 +2272,13 @@
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
- "r": 119,
- "g": 119,
- "b": 119,
+ "r": 255,
+ "g": 255,
+ "b": 255,
"a": 255
},
"_spriteFrame": {
- "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@b9538",
+ "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@bec19",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
@@ -2292,8 +2292,11 @@
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
- "_useGrayscale": true,
- "_atlas": null,
+ "_useGrayscale": false,
+ "_atlas": {
+ "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73",
+ "__expectedType__": "cc.SpriteAtlas"
+ },
"_id": ""
},
{
@@ -2336,7 +2339,7 @@
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": -45.138,
+ "x": -42,
"y": 0,
"z": 0
},
@@ -2377,7 +2380,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 24.021484375,
+ "width": 14.0107421875,
"height": 30.46
},
"_anchorPoint": {
@@ -2413,7 +2416,7 @@
"b": 255,
"a": 255
},
- "_string": "10",
+ "_string": "9",
"_horizontalAlign": 1,
"_verticalAlign": 1,
"_actualFontSize": 18,
@@ -2696,7 +2699,7 @@
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": 51.913,
+ "x": 49.803,
"y": 20.433,
"z": 0
},