播插屏位置改回原来的,补充未同步的
This commit is contained in:
parent
d6c6dfa46f
commit
682849c0a0
|
|
@ -183,7 +183,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 0, y: 220}
|
m_AnchoredPosition: {x: 0, y: 360}
|
||||||
m_SizeDelta: {x: 192, y: 192}
|
m_SizeDelta: {x: 192, y: 192}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &3202746937996263206
|
--- !u!222 &3202746937996263206
|
||||||
|
|
@ -820,7 +820,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 0, y: 220}
|
m_AnchoredPosition: {x: 0, y: 360}
|
||||||
m_SizeDelta: {x: 481, y: 244}
|
m_SizeDelta: {x: 481, y: 244}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &3202746939300847411
|
--- !u!222 &3202746939300847411
|
||||||
|
|
|
||||||
|
|
@ -706,7 +706,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 170, y: -120}
|
m_AnchoredPosition: {x: 170, y: 30}
|
||||||
m_SizeDelta: {x: 200, y: 200}
|
m_SizeDelta: {x: 200, y: 200}
|
||||||
m_Pivot: {x: 0.5, y: 0.55}
|
m_Pivot: {x: 0.5, y: 0.55}
|
||||||
--- !u!222 &7877568658873081054
|
--- !u!222 &7877568658873081054
|
||||||
|
|
@ -834,7 +834,7 @@ MonoBehaviour:
|
||||||
autoPlay: 0
|
autoPlay: 0
|
||||||
useTargetAsV3: 0
|
useTargetAsV3: 0
|
||||||
endValueFloat: 0
|
endValueFloat: 0
|
||||||
endValueV3: {x: 0, y: -120, z: 0}
|
endValueV3: {x: 0, y: 30, z: 0}
|
||||||
endValueV2: {x: 0, y: 0}
|
endValueV2: {x: 0, y: 0}
|
||||||
endValueColor: {r: 1, g: 1, b: 1, a: 1}
|
endValueColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
endValueString:
|
endValueString:
|
||||||
|
|
@ -922,7 +922,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 30, y: -430}
|
m_AnchoredPosition: {x: 30, y: -280}
|
||||||
m_SizeDelta: {x: 200, y: 200}
|
m_SizeDelta: {x: 200, y: 200}
|
||||||
m_Pivot: {x: 0.5, y: 0.55}
|
m_Pivot: {x: 0.5, y: 0.55}
|
||||||
--- !u!222 &7877568659269773446
|
--- !u!222 &7877568659269773446
|
||||||
|
|
@ -1050,7 +1050,7 @@ MonoBehaviour:
|
||||||
autoPlay: 0
|
autoPlay: 0
|
||||||
useTargetAsV3: 0
|
useTargetAsV3: 0
|
||||||
endValueFloat: 0
|
endValueFloat: 0
|
||||||
endValueV3: {x: 30, y: -120, z: 0}
|
endValueV3: {x: 30, y: 30, z: 0}
|
||||||
endValueV2: {x: 0, y: 0}
|
endValueV2: {x: 0, y: 0}
|
||||||
endValueColor: {r: 1, g: 1, b: 1, a: 1}
|
endValueColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
endValueString:
|
endValueString:
|
||||||
|
|
@ -1401,7 +1401,7 @@ PrefabInstance:
|
||||||
- target: {fileID: 1304971611175877922, guid: d8dbcb675f62744a4b0d67e0735ff227,
|
- target: {fileID: 1304971611175877922, guid: d8dbcb675f62744a4b0d67e0735ff227,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 450
|
value: 600
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1304971611175877922, guid: d8dbcb675f62744a4b0d67e0735ff227,
|
- target: {fileID: 1304971611175877922, guid: d8dbcb675f62744a4b0d67e0735ff227,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
|
@ -1558,7 +1558,7 @@ PrefabInstance:
|
||||||
- target: {fileID: 1304971611175877922, guid: d8dbcb675f62744a4b0d67e0735ff227,
|
- target: {fileID: 1304971611175877922, guid: d8dbcb675f62744a4b0d67e0735ff227,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 200
|
value: 365
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1304971611175877922, guid: d8dbcb675f62744a4b0d67e0735ff227,
|
- target: {fileID: 1304971611175877922, guid: d8dbcb675f62744a4b0d67e0735ff227,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
|
@ -1700,7 +1700,7 @@ PrefabInstance:
|
||||||
- target: {fileID: 1304971611175877922, guid: d8dbcb675f62744a4b0d67e0735ff227,
|
- target: {fileID: 1304971611175877922, guid: d8dbcb675f62744a4b0d67e0735ff227,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 200
|
value: 365
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1304971611175877922, guid: d8dbcb675f62744a4b0d67e0735ff227,
|
- target: {fileID: 1304971611175877922, guid: d8dbcb675f62744a4b0d67e0735ff227,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
|
@ -1842,7 +1842,7 @@ PrefabInstance:
|
||||||
- target: {fileID: 1304971611175877922, guid: d8dbcb675f62744a4b0d67e0735ff227,
|
- target: {fileID: 1304971611175877922, guid: d8dbcb675f62744a4b0d67e0735ff227,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 450
|
value: 600
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1304971611175877922, guid: d8dbcb675f62744a4b0d67e0735ff227,
|
- target: {fileID: 1304971611175877922, guid: d8dbcb675f62744a4b0d67e0735ff227,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
|
|
||||||
|
|
@ -629,7 +629,7 @@ Transform:
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 230701045}
|
m_GameObject: {fileID: 230701045}
|
||||||
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
|
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 6.5}
|
m_LocalPosition: {x: 0, y: 0, z: 15}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 1617442649}
|
- {fileID: 1617442649}
|
||||||
|
|
|
||||||
|
|
@ -13,8 +13,8 @@ public class EnemyManager : GroupManager
|
||||||
|
|
||||||
if (PlayerData.Instance.CurrentLevel <= 3)
|
if (PlayerData.Instance.CurrentLevel <= 3)
|
||||||
{
|
{
|
||||||
tAttr.MaxHP = (int)(0.8f * tAttr.MaxHP);
|
tAttr.MaxHP = (int)(0.75f * tAttr.MaxHP);
|
||||||
tAttr.Damage = (int)(0.8f * tAttr.Damage);
|
tAttr.Damage = (int)(0.75f * tAttr.Damage);
|
||||||
}
|
}
|
||||||
|
|
||||||
pUnit.InitAttr(tAttr);
|
pUnit.InitAttr(tAttr);
|
||||||
|
|
|
||||||
|
|
@ -302,6 +302,8 @@ public class GameLogic : MonoBehaviour
|
||||||
|
|
||||||
mOverTimer.StartTimer(() =>
|
mOverTimer.StartTimer(() =>
|
||||||
{
|
{
|
||||||
|
AdsUtils.PlayInterstitial(mIsWin ? Const.AdsValue.GameSuccess : Const.AdsValue.GameFailure, mIsWin);
|
||||||
|
|
||||||
PanelResult tUIResult = UIManager.Instance.OpenUI<PanelResult>();
|
PanelResult tUIResult = UIManager.Instance.OpenUI<PanelResult>();
|
||||||
tUIResult.InitResult(mIsWin, mEnemyGroupMgr.TotalDamage, TKGSDKManager.Instance.GetConfigBool(TKGParamKey.NativeSwitch.ToString()) && TKGUtils.IsNativeReady());
|
tUIResult.InitResult(mIsWin, mEnemyGroupMgr.TotalDamage, TKGSDKManager.Instance.GetConfigBool(TKGParamKey.NativeSwitch.ToString()) && TKGUtils.IsNativeReady());
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -60,7 +60,7 @@ public class PanelResult : BasePanel
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
float tLevelFactor = ((PlayerData.Instance.CurrentLevel - 1) / 20) * 0.5f + 1;
|
float tLevelFactor = ((PlayerData.Instance.CurrentLevel - 1) / 20) * 0.5f + 1;
|
||||||
mBaseCoin = (int)(pTotalHurt * 10 * tLevelFactor * (mWin ? 1 : 0.5f));
|
mBaseCoin = (int)(pTotalHurt * 10 * tLevelFactor * (mWin ? 1f : 0.3f));
|
||||||
}
|
}
|
||||||
|
|
||||||
mIsRolling = true;
|
mIsRolling = true;
|
||||||
|
|
@ -198,7 +198,7 @@ public class PanelResult : BasePanel
|
||||||
mBtnAdCoin.gameObject.SetActive(false);
|
mBtnAdCoin.gameObject.SetActive(false);
|
||||||
mBtnContinue.gameObject.SetActive(false);
|
mBtnContinue.gameObject.SetActive(false);
|
||||||
|
|
||||||
TimerManager.Instance.Schedule(LoadGame, pWaitSeconds);
|
TimerManager.Instance.Schedule(GameManager.Instance.LoadGame, pWaitSeconds);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void LoadGame()
|
private void LoadGame()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue