tron_wz/CaptainDiceDubloons_IOS_unity
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改bug

Browse Source
This commit is contained in:
changyunjia
2026-05-25 16:12:18 +08:00
parent bbfba5c926
commit c9666719a7
57 changed files with 59 additions and 1166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/ModuleManager/ModuleManagerRegister.cs
-4
View File
@@ -30,7 +30,6 @@ namespace ChillConnect
moduleManager.AddModel(ModelConst.WheelViewModel, new WheelViewModel());
moduleManager.AddModel(ModelConst.BuygoldModel, new BuygoldModel());
moduleManager.AddModel(ModelConst.GameMenuModel, new GameMenuModel());
moduleManager.AddModel(ModelConst.EggViewModel, new EggViewModel());
moduleManager.AddModel(ModelConst.PersonViewModel, new PersonViewModel());
moduleManager.AddModel(ModelConst.TipsViewModel, new TipsViewModel());
moduleManager.AddModel(ModelConst.LevelRewardModel, new LevelRewardModel());
@@ -82,7 +81,6 @@ namespace ChillConnect
moduleManager.AddUICtrl(UICtrlConst.WheelViewUICtrl, new WheelViewUICtrl());
moduleManager.AddUICtrl(UICtrlConst.BuygoldUICtrl, new BuygoldUICtrl());
moduleManager.AddUICtrl(UICtrlConst.GameMenuUICtrl, new GameMenuUICtrl());
moduleManager.AddUICtrl(UICtrlConst.EggViewUICtrl, new EggViewUICtrl());
moduleManager.AddUICtrl(UICtrlConst.PersonViewUICtrl, new PersonViewUICtrl());
moduleManager.AddUICtrl(UICtrlConst.TipsViewUICtrl, new TipsViewUICtrl());
moduleManager.AddUICtrl(UICtrlConst.LevelRewardUICtrl, new LevelRewardUICtrl());
@@ -136,7 +134,6 @@ namespace ChillConnect
moduleManager.AddCtrl(CtrlConst.WheelViewCtrl, new WheelViewCtrl());
moduleManager.AddCtrl(CtrlConst.BuygoldCtrl, new BuygoldCtrl());
moduleManager.AddCtrl(CtrlConst.GameMenuCtrl, new GameMenuCtrl());
moduleManager.AddCtrl(CtrlConst.EggViewCtrl, new EggViewCtrl());
moduleManager.AddCtrl(CtrlConst.PersonViewCtrl, new PersonViewCtrl());
moduleManager.AddCtrl(CtrlConst.TipsViewCtrl, new TipsViewCtrl());
moduleManager.AddCtrl(CtrlConst.LevelRewardCtrl, new LevelRewardCtrl());
@@ -190,7 +187,6 @@ namespace ChillConnect
moduleManager.AddUIType(UIConst.WheelViewUI, typeof(WheelViewUI));
moduleManager.AddUIType(UIConst.BuygoldUI, typeof(BuygoldUI));
moduleManager.AddUIType(UIConst.GameMenuUI, typeof(GameMenuUI));
moduleManager.AddUIType(UIConst.EggViewUI, typeof(EggViewUI));
moduleManager.AddUIType(UIConst.PersonViewUI, typeof(PersonViewUI));
moduleManager.AddUIType(UIConst.TipsViewUI, typeof(TipsViewUI));
moduleManager.AddUIType(UIConst.LevelRewardUI, typeof(LevelRewardUI));
Assets/Scripts/ModuleUI/EggView.meta
-8
View File
@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 3fffb6fe8cbf8b443b36f49dcf29c2e8
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/ModuleUI/EggView/EggViewCtrl.cs
-41
View File
@@ -1,41 +0,0 @@
namespace ChillConnect
{
public class EggViewCtrl : BaseCtrl
{
public static EggViewCtrl Instance { get; private set; }
private EggViewModel model;
#region 生命周期
protected override void OnInit()
{
Instance = this;
}
protected override void OnDispose()
{
Instance = null;
}
#endregion
#region 消息
protected override void AddListener()
{
}
protected override void RemoveListener()
{
}
protected override void AddServerListener()
{
}
protected override void RemoveServerListener()
{
}
#endregion
}
}
Assets/Scripts/ModuleUI/EggView/EggViewCtrl.cs.meta
-11
View File
@@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 067af4881df6cf24da19c0bdc72b1c5d
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/ModuleUI/EggView/EggViewModel.cs
-26
View File
@@ -1,26 +0,0 @@
namespace ChillConnect
{
public class EggViewModel : BaseModel
{
#region 生命周期
protected override void OnInit()
{
}
protected override void OnDispose()
{
}
#endregion
#region 消息
protected override void AddListener()
{
}
protected override void RemoveListener()
{
}
#endregion
}
}
Assets/Scripts/ModuleUI/EggView/EggViewModel.cs.meta
-11
View File
@@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: c5e97df5815dcae438de3904dace8576
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/ModuleUI/EggView/EggViewUI.cs
-228
View File
@@ -1,228 +0,0 @@
// using FGUI.A000_common;
using System;
using System.Collections.Generic;
using DG.Tweening;
using FairyGUI;
using FGUI.Egg_20;
using IgnoreOPS;
using Spine.Unity;
using UnityEngine;
using Random = UnityEngine.Random;
namespace ChillConnect
{
public class EggViewUI : BaseUI
{
private EggViewUICtrl ctrl;
private com_egg ui;
private Action closeCallback;
private bool isShowAnim;
public EggViewUI(EggViewUICtrl ctrl) : base(ctrl)
{
uiName = UIConst.EggViewUI;
this.ctrl = ctrl;
}
protected override void SetUIInfo(UIInfo uiInfo)
{
uiInfo.packageName = "Egg_20";
uiInfo.assetName = "com_egg";
uiInfo.layerType = UILayerType.Popup;
uiInfo.isNeedOpenAnim = false;
uiInfo.isNeedCloseAnim = false;
uiInfo.isNeedUIMask = true;
}
#region 生命周期
protected override void OnInit()
{
}
protected override void OnClose()
{
}
protected override void OnBind()
{
ui = baseUI as com_egg;
}
private List<com_egg_item> eggList = new List<com_egg_item>();
protected override void OnOpenBefore(object args)
{
if (Screen.safeArea.y != 0)
{
ui.com_gold.y += 68;
}
eggList.Add(ui.egg_item0);
eggList.Add(ui.egg_item1);
eggList.Add(ui.egg_item2);
eggList.Add(ui.egg_item3);
InitView();
}
protected override void OnOpen(object args)
{
}
protected override void OnHide()
{
}
protected override void OnDisplay(object args)
{
}
#endregion
#region 消息
protected override void AddListener()
{
}
protected override void RemoveListener()
{
}
#endregion
//初始化页面逻辑
private void InitView()
{
ui.com_gold.GetChild("text_gold").text = GameHelper.Get101Str(GameHelper.GetGoldNumber());
int start = GameHelper.GetCommonModel().eggReward[0];
int end = GameHelper.GetCommonModel().eggReward[1];
int randomNumber = Random.Range(start, end + 1);
ui.btn_close.SetClick(() =>
{
if (isShowAnim)
{
GetReward(randomNumber);
}
else
{
CtrlCloseUI();
}
});
ui.btn_claim.SetClick(() =>
{
if (isShowAnim)
{
GetReward(randomNumber);
}
});
ui.btn_claim_mult.SetClick(() =>
{
if (isShowAnim)
{
GameHelper.ShowVideoAd("reward_egg", isSuccess =>
{
if (isSuccess)
{
GetReward(randomNumber * 2);
}
});
}
});
for (int i = 0; i < eggList.Count; i++)
{
int index = i;
eggList[index].egg_state.selectedIndex = 0;
eggList[index].SetClick(() =>
{
eggList[index].egg.visible = false;
setEggClickStatus(false);
if (AudioManager.Instance.IsOpenEffect)
{
AudioManager.Instance.PlayDynamicEffect(AudioConst.egg);
}
eggList[index].text_num.text = "x" + GameHelper.Get101Str(randomNumber);
var ani_node = eggList[index].GetChild("anim_bg") as GGraph;
var sk = FXManager.Instance.SetFx<SkeletonAnimation>(ani_node, Fx_Type.fx_egg_light, ref closeCallback);
sk.state.SetAnimation(0, "animation", false);
sk.state.Complete += a =>
{
isShowAnim = true;
var sk1 = FXManager.Instance.SetFx<SkeletonAnimation>(eggList[index].GetChild("anim_bg1") as GGraph, Fx_Type.fx_egg, ref closeCallback);
sk1.state.SetAnimation(0, "animation", true);
eggList[index].egg_state.selectedIndex = 1;
setCliamStatus(true);
};
});
}
}
void setCliamStatus(bool show)
{
ui.btn_claim_mult.visible = show;
DOVirtual.DelayedCall(1f, () =>
{
ui.btn_claim.visible = show;
});
}
void setEggClickStatus(bool isClick)
{
foreach (var item in eggList)
{
item.touchable = isClick;
}
}
private void GetReward(int awardNum)
{
isShowAnim = false;
var rewardData = new RewardData();
var start_pos = GameHelper.GetUICenterPosition(ui.btn_claim_mult);
var end = GameHelper.GetUICenterPosition(ui.com_gold.GetChild("icon"));
var rewardSingleData = new RewardSingleData(101, awardNum, RewardOrigin.AdTask)
{
startPosition = start_pos,
endPosition = new Vector2(end.x - 150, end.y - 136)
};
rewardData.AddReward(rewardSingleData);
rewardData.displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange;
rewardData.AddCompleted(success =>
{
if (success)
{
var startNum = DataMgr.Coin.Value - awardNum;
DOVirtual.Float(startNum, GameHelper.GetGoldNumber(), 1f,
value => { ui.com_gold.GetChild("text_gold").text = GameHelper.Get101Str((decimal)value); });
DOVirtual.DelayedCall(1.2f, () =>
{
CtrlCloseUI();
});
SaveData.GetSaveObject().crush_egg_time = (int)GameHelper.GetNowTime() + GameHelper.GetCommonModel().eggCD;
SaveData.saveDataFunc();
}
});
GameDispatcher.Instance.Dispatch(GameMsg.GetReward, rewardData);
}
}
}
Assets/Scripts/ModuleUI/EggView/EggViewUI.cs.meta
-11
View File
@@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 521040850d295c84780f72d314d1fea2
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/ModuleUI/EggView/EggViewUICtrl.cs
-79
View File
@@ -1,79 +0,0 @@
namespace ChillConnect
{
public class EggViewUICtrl : BaseUICtrl
{
private readonly uint closeUIMsg = UICtrlMsg.EggUI_Close;
private EggViewModel model;
private readonly uint openUIMsg = UICtrlMsg.EggUI_Open;
private EggViewUI ui;
#region 生命周期
protected override void OnInit()
{
}
protected override void OnDispose()
{
}
public override void OpenUI(object args = null)
{
if (ui == null)
{
ui = new EggViewUI(this);
ui.Open(args);
}
}
public override void CloseUI(object args = null)
{
if (ui != null && !ui.isClose)
{
ui.Close();
}
ui = null;
}
#endregion
#region 消息
public override uint GetOpenUIMsg(string uiName)
{
return openUIMsg;
}
public override uint GetCloseUIMsg(string uiName)
{
return closeUIMsg;
}
protected override void AddListener()
{
uiCtrlDispatcher.AddListener(openUIMsg, OpenUI);
uiCtrlDispatcher.AddListener(closeUIMsg, CloseUI);
}
protected override void RemoveListener()
{
uiCtrlDispatcher.RemoveListener(openUIMsg, OpenUI);
uiCtrlDispatcher.RemoveListener(closeUIMsg, CloseUI);
}
protected override void AddServerListener()
{
}
protected override void RemoveServerListener()
{
}
#endregion
}
}
Assets/Scripts/ModuleUI/EggView/EggViewUICtrl.cs.meta
-11
View File
@@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 548b6b5219329cc4f88e684c3ab7a168
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/ModuleUI/Hall/HallUI.cs
+1 -1
View File
@@ -81,7 +81,7 @@ namespace ChillConnect
{
if (Screen.safeArea.y != 0)
{
// ui.top_group.y += 68;
ui.top_group.y += 68;
ui.left_group.y += 68;
ui.right_group.y += 68;
}
Assets/Scripts/ModuleUI/Reward/RewardUI.cs
+1 -1
View File
@@ -95,7 +95,7 @@ namespace ChillConnect
var value = GetRewardValue();
ui.text_num.text = GameHelper.Get101Str(value);
ui.btn_collect.title = "Claim(<img src='ui://o9974uc5cou6b8'/>" + GameHelper.Get101Str((decimal)value) + ")";
ui.btn_collect.title = "Claim(<img src='ui://o9974uc5k1oncy'/>" + GameHelper.Get101Str((decimal)value) + ")";
DOVirtual.DelayedCall(0.2f, () =>
{
var gamwin =
Assets/Scripts/ModuleUI/ShopView/BuygoldUI.cs
+7 -7
View File
@@ -4,6 +4,7 @@ using DG.Tweening;
using FairyGUI;
using FGUI.store_17;
using IgnoreOPS;
using Newtonsoft.Json;
using SGModule.Net;
using SGModule.NetKit;
using Spine.Unity;
@@ -102,12 +103,11 @@ namespace ChillConnect
PaidgiftList = ConfigSystem.GetConfig<PaidgiftModel>().DataList;
// NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.gold_show, 1);
TrackKit.SendEvent(GameHelper.getTrackEvenName(),Property.GoldShow);
TrackKit.SendEvent(GameHelper.getTrackEvenName(), Property.GoldShow);
ui.top_gold.GetChild("text_gold").text = GameHelper.Get101Str(GameHelper.GetGoldNumber());
// ui.shop_panel_parent.shopPanel.pay_type.selectedIndex = !GameHelper.IsAdModelOfPay() ? 1 : 0;
// ui.shop_panel_parent.shopPanel.pay_type.selectedIndex = !GameHelper.IsAdModelOfPay() ? 1 : 0;
if (GameHelper.IsAdModelOfPay())
{
@@ -246,7 +246,7 @@ namespace ChillConnect
{
// NetworkKit.BuriedPoint(BuriedPointEvent.Apple_AD_event, BuriedPointEvent.gold_click_ad,1);
TrackKit.SendEvent(GameHelper.getTrackEvenName(),Property.GoldClickAd);
TrackKit.SendEvent(GameHelper.getTrackEvenName(), Property.GoldClickAd);
GameHelper.ShowVideoAd("BuyGold", issuccess =>
{
@@ -323,7 +323,7 @@ namespace ChillConnect
{
item.btn_buy.can_buy.selectedIndex = 0;
decimal price = (decimal)list[index].Payment_amount2;
item.btn_buy.btn_text.text = GameHelper.getPrice(price);
item.btn_buy.btn_text.text = GameHelper.getPrice(price);
if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig<CommonModel>().PiggyBankSwitch == 1)
{
@@ -337,12 +337,12 @@ namespace ChillConnect
if (myAds >= needAds)
{
item.btn_buy.can_buy.selectedIndex = 0;
item.btn_buy.btn_text.text = "Redeem";
item.btn_buy.btn_text.text = needAds + "ADs";
}
else
{
item.btn_buy.can_buy.selectedIndex = 1;
item.btn_buy.btn_text.text = myAds + "/" + needAds;
item.btn_buy.btn_text.text = needAds + "ADs";
}
item.text_ads.SetVar("ads", needAds.ToString()).FlushVars();