fix:1、删除部分不用的资源代码。2、a面修复bug
This commit is contained in:
@@ -8,6 +8,7 @@ namespace FGUI.ZM_Img_02
|
||||
public partial class com_loadingBg : GComponent
|
||||
{
|
||||
public GImage bg;
|
||||
public GImage img_icon;
|
||||
public GGraph bg_parent;
|
||||
public const string URL = "ui://g8449vzzopwg0";
|
||||
|
||||
@@ -21,6 +22,7 @@ namespace FGUI.ZM_Img_02
|
||||
base.ConstructFromXML(xml);
|
||||
|
||||
bg = (GImage)GetChildAt(0);
|
||||
img_icon = (GImage)GetChildAt(1);
|
||||
bg_parent = (GGraph)GetChildAt(2);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,7 +12,6 @@ namespace FGUI.ZM_Lobby_03
|
||||
UIObjectFactory.SetPackageItemExtension(btn_egg.URL, typeof(btn_egg));
|
||||
UIObjectFactory.SetPackageItemExtension(com_first_award.URL, typeof(com_first_award));
|
||||
UIObjectFactory.SetPackageItemExtension(btn_item_play.URL, typeof(btn_item_play));
|
||||
UIObjectFactory.SetPackageItemExtension(com_map.URL, typeof(com_map));
|
||||
UIObjectFactory.SetPackageItemExtension(com_hall.URL, typeof(com_hall));
|
||||
UIObjectFactory.SetPackageItemExtension(com_payloading.URL, typeof(com_payloading));
|
||||
UIObjectFactory.SetPackageItemExtension(btn_play.URL, typeof(btn_play));
|
||||
|
||||
@@ -1,55 +0,0 @@
|
||||
/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
|
||||
|
||||
using FairyGUI;
|
||||
using FairyGUI.Utils;
|
||||
|
||||
namespace FGUI.ZM_Lobby_03
|
||||
{
|
||||
public partial class com_map : GComponent
|
||||
{
|
||||
public GButton head;
|
||||
public GButton btn_back;
|
||||
public GButton com_gold;
|
||||
public btn_item_play btn_play12;
|
||||
public btn_item_play btn_play11;
|
||||
public btn_item_play btn_play10;
|
||||
public btn_item_play btn_play9;
|
||||
public btn_item_play btn_play8;
|
||||
public btn_item_play btn_play7;
|
||||
public btn_item_play btn_play6;
|
||||
public btn_item_play btn_play5;
|
||||
public btn_item_play btn_play4;
|
||||
public btn_item_play btn_play3;
|
||||
public btn_item_play btn_play2;
|
||||
public btn_item_play btn_play1;
|
||||
public GGroup panel;
|
||||
public const string URL = "ui://gytj501cnq232i";
|
||||
|
||||
public static com_map CreateInstance()
|
||||
{
|
||||
return (com_map)UIPackage.CreateObject("ZM_Lobby_03", "com_map");
|
||||
}
|
||||
|
||||
public override void ConstructFromXML(XML xml)
|
||||
{
|
||||
base.ConstructFromXML(xml);
|
||||
|
||||
head = (GButton)GetChildAt(2);
|
||||
btn_back = (GButton)GetChildAt(3);
|
||||
com_gold = (GButton)GetChildAt(4);
|
||||
btn_play12 = (btn_item_play)GetChildAt(5);
|
||||
btn_play11 = (btn_item_play)GetChildAt(6);
|
||||
btn_play10 = (btn_item_play)GetChildAt(7);
|
||||
btn_play9 = (btn_item_play)GetChildAt(8);
|
||||
btn_play8 = (btn_item_play)GetChildAt(9);
|
||||
btn_play7 = (btn_item_play)GetChildAt(10);
|
||||
btn_play6 = (btn_item_play)GetChildAt(11);
|
||||
btn_play5 = (btn_item_play)GetChildAt(12);
|
||||
btn_play4 = (btn_item_play)GetChildAt(13);
|
||||
btn_play3 = (btn_item_play)GetChildAt(14);
|
||||
btn_play2 = (btn_item_play)GetChildAt(15);
|
||||
btn_play1 = (btn_item_play)GetChildAt(16);
|
||||
panel = (GGroup)GetChildAt(17);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: eacb8e3435b889544875b536d37e9290
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -932,6 +932,8 @@ namespace RedHotRoast
|
||||
|
||||
public static void addInterAdnumber()
|
||||
{
|
||||
|
||||
return;
|
||||
if (GetVipPrivilege(Subscription.RemoveInterstitialAd.As<int>())) return;
|
||||
look_interad_numbers++;
|
||||
Debug.Log($"[back hall]1 SaveData.GetSaveObject().is_get_removead=========={SaveData.GetSaveObject().is_get_removead} ");
|
||||
@@ -1686,25 +1688,25 @@ namespace RedHotRoast
|
||||
public static void ShowTurnOffReward()
|
||||
{
|
||||
Debug.Log("chansghidakai");
|
||||
if (!UIManager.Instance.IsExistUI(UIConst.GoldRewardUI))
|
||||
{
|
||||
if (IsTemporaryEnd) return;
|
||||
if (SaveData.GetSaveObject().TurnOffDay != DateTime.Now.Day)
|
||||
{
|
||||
SaveData.GetSaveObject().TurnOffDay = DateTime.Now.Day;
|
||||
SaveData.GetSaveObject().TurnOffNumbers = 0;
|
||||
}
|
||||
if (Random.Range(0, 100) < ConfigSystem.GetCommonConf().TurnOffRewardsRate)
|
||||
{
|
||||
if ((SaveData.GetSaveObject().TurnOffNumbers < ConfigSystem.GetCommonConf().TurnOffRewardslimit) && (GameHelper.GetNowTime() > SaveData.GetSaveObject().TurnOffTime))
|
||||
{
|
||||
SaveData.GetSaveObject().TurnOffTime = GameHelper.GetNowTime() + ConfigSystem.GetCommonConf().TurnOffRewardsCD;
|
||||
SaveData.GetSaveObject().TurnOffNumbers++;
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.GoldRewardUI_Open);
|
||||
}
|
||||
}
|
||||
SaveData.SaveDataFunc();
|
||||
}
|
||||
// if (!UIManager.Instance.IsExistUI(UIConst.GoldRewardUI))
|
||||
// {
|
||||
// if (IsTemporaryEnd) return;
|
||||
// if (SaveData.GetSaveObject().TurnOffDay != DateTime.Now.Day)
|
||||
// {
|
||||
// SaveData.GetSaveObject().TurnOffDay = DateTime.Now.Day;
|
||||
// SaveData.GetSaveObject().TurnOffNumbers = 0;
|
||||
// }
|
||||
// if (Random.Range(0, 100) < ConfigSystem.GetCommonConf().TurnOffRewardsRate)
|
||||
// {
|
||||
// if ((SaveData.GetSaveObject().TurnOffNumbers < ConfigSystem.GetCommonConf().TurnOffRewardslimit) && (GameHelper.GetNowTime() > SaveData.GetSaveObject().TurnOffTime))
|
||||
// {
|
||||
// SaveData.GetSaveObject().TurnOffTime = GameHelper.GetNowTime() + ConfigSystem.GetCommonConf().TurnOffRewardsCD;
|
||||
// SaveData.GetSaveObject().TurnOffNumbers++;
|
||||
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.GoldRewardUI_Open);
|
||||
// }
|
||||
// }
|
||||
// SaveData.SaveDataFunc();
|
||||
// }
|
||||
}
|
||||
public static bool isAutoPop = false;
|
||||
public static int GetVipLevel()
|
||||
|
||||
@@ -6,7 +6,7 @@ namespace RedHotRoast
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using IgnoreOPS;
|
||||
using SGModule.ApplePay;
|
||||
// using SGModule.ApplePay;
|
||||
using SGModule.Common;
|
||||
using UnityEngine;
|
||||
|
||||
@@ -77,23 +77,23 @@ namespace RedHotRoast
|
||||
};
|
||||
List<ApplePay2> listA = ConfigSystem.GetConfig<ApplePay2>();
|
||||
|
||||
// 方式一:LINQ Select
|
||||
List<ProductConfig> listB = listA
|
||||
.Select(a => new ProductConfig
|
||||
{
|
||||
name = a.name,
|
||||
sku = a.sku,
|
||||
price = a.price,
|
||||
type = a.type
|
||||
})
|
||||
.ToList();
|
||||
if (GameHelper.IsGiftSwitch())
|
||||
{
|
||||
GameObject.Find("game_bg_a").SetActive(false);
|
||||
}
|
||||
//初始化商品
|
||||
ApplePayManager.Instance.InitProduct(listB,
|
||||
ConfigManager.GameConfig.packageName, PurchasingManager.ApplePaySuccessCallback(appleData));
|
||||
// // 方式一:LINQ Select
|
||||
// List<ProductConfig> listB = listA
|
||||
// .Select(a => new ProductConfig
|
||||
// {
|
||||
// name = a.name,
|
||||
// sku = a.sku,
|
||||
// price = a.price,
|
||||
// type = a.type
|
||||
// })
|
||||
// .ToList();
|
||||
// if (GameHelper.IsGiftSwitch())
|
||||
// {
|
||||
// GameObject.Find("game_bg_a").SetActive(false);
|
||||
// }
|
||||
// //初始化商品
|
||||
// ApplePayManager.Instance.InitProduct(listB,
|
||||
// ConfigManager.GameConfig.packageName, PurchasingManager.ApplePaySuccessCallback(appleData));
|
||||
|
||||
if (GameHelper.IsGiftSwitch() && enterGame)
|
||||
{
|
||||
|
||||
@@ -15,7 +15,7 @@ namespace FairyGUI
|
||||
/// 4.x: Put the xxx.ttf into /Resources or /Resources/Fonts, and set defaultFont="xxx".
|
||||
/// 5.x: set defaultFont to system font name(or names joint with comma). e.g. defaultFont="Microsoft YaHei, SimHei"
|
||||
/// </summary>
|
||||
public static string defaultFont = "BOONTOOK-ULTRA";
|
||||
public static string defaultFont = "BalooBhaina-Regular";
|
||||
|
||||
[Obsolete("No use anymore")]
|
||||
public static bool renderingTextBrighterOnDesktop = true;
|
||||
|
||||
Reference in New Issue
Block a user