yangwu
/
mergemilitary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug

This commit is contained in:
yangjing 2022-08-31 21:09:23 +08:00
parent c3080c7e0f
commit caf461888b
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Scripts/Editor/ExcelBuilder/ExcelPaser.cs
View File

@ -1,7 +1,9 @@
using System.Data; using System.Data;
using System.IO; using System.IO;
using System.Collections.Generic; using System.Collections.Generic;
#if UNITY_EDITOR
using Excel; using Excel;
#endif
using UnityEngine; using UnityEngine;
public class ExcelParser public class ExcelParser
@ -59,6 +61,7 @@ public class ExcelParser
/// <returns></returns> /// <returns></returns>
static DataRowCollection ReadExcelContext(string pFilePath, ref int pColNum, ref int pRowNum) static DataRowCollection ReadExcelContext(string pFilePath, ref int pColNum, ref int pRowNum)
{ {
#if UNITY_EDITOR
FileStream stream = File.Open(pFilePath, FileMode.Open, FileAccess.Read, FileShare.Read); FileStream stream = File.Open(pFilePath, FileMode.Open, FileAccess.Read, FileShare.Read);
IExcelDataReader excelReader = ExcelReaderFactory.CreateBinaryReader(stream); IExcelDataReader excelReader = ExcelReaderFactory.CreateBinaryReader(stream);
@ -67,5 +70,8 @@ public class ExcelParser
pColNum = result.Tables[0].Columns.Count; pColNum = result.Tables[0].Columns.Count;
pRowNum = result.Tables[0].Rows.Count; pRowNum = result.Tables[0].Rows.Count;
return result.Tables[0].Rows; return result.Tables[0].Rows;
#else
return null;
#endif
} }
} }

4
Assets/Scripts/Utils/AdsUtils.cs
View File

@ -69,8 +69,12 @@ public static class AdsUtils
public static void PlayReward(TKGRVPositionName pAdPos, Action pSuccessCallback = null) public static void PlayReward(TKGRVPositionName pAdPos, Action pSuccessCallback = null)
{ {
TKGSDKManager.Instance.ShowRewardAd(pAdPos, (pResult) => TKGSDKManager.Instance.ShowRewardAd(pAdPos, (pResult) =>
{
if (pResult)
{ {
pSuccessCallback?.Invoke(); pSuccessCallback?.Invoke();
}
}, noUnityTips, true); }, noUnityTips, true);
} }