Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
# Conflicts:
# System/YinJi.meta
| | |
|---|
| | | |
|---|
| | | { |
|---|
| | | |
|---|
| | | bool gen_ret = gen_to_be_invoked.IsExpired( ); |
|---|
| | | bool gen_ret = !gen_to_be_invoked.IsExpired( ); |
|---|
| | | LuaAPI.lua_pushboolean(L, gen_ret); |
|---|
| | | |
|---|
| | | |
|---|
| | |
|---|
| | | case DailyQuestType.HazyRegion:
|
|---|
| | | WindowCenter.Instance.Open<CrossServerWin>(false, 0);
|
|---|
| | | break;
|
|---|
| | | case DailyQuestType.RidingPetActivity:
|
|---|
| | | WindowCenter.Instance.Open<LootPreciousFrameWin>(false, 1);
|
|---|
| | | break;
|
|---|
| | | }
|
|---|
| | | }
|
|---|
| | | else
|
|---|
| | |
|---|
| | | DailyQuestModel dailyQuestModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }
|
|---|
| | |
|
|---|
| | | RidingPetBossModel ridingPetMdoel { get { return ModelCenter.Instance.GetModel<RidingPetBossModel>(); } }
|
|---|
| | | public int RawImagetestBossID = 50103006;
|
|---|
| | | //public int RawImagetestBossID = 50103006;
|
|---|
| | | public RewardPositionType rewardPositonType;
|
|---|
| | | [SerializeField] ItemCell[] m_RewardArray;
|
|---|
| | |
|
|---|
| | |
|---|
| | | {
|
|---|
| | | get
|
|---|
| | | {
|
|---|
| | | return IsExpired();
|
|---|
| | | return !IsExpired();
|
|---|
| | | }
|
|---|
| | | }
|
|---|
| | |
|
|---|
| | |
|---|
| | | }
|
|---|
| | | int GetDayOfYear = DateTime.Now.DayOfYear;
|
|---|
| | | int day = LocalSave.GetInt("IsOpenLimitedTime");
|
|---|
| | | bool Isbool = IsExpired();
|
|---|
| | | if (day != GetDayOfYear && IsExpired())
|
|---|
| | | bool Isbool = !IsExpired();
|
|---|
| | | if (day != GetDayOfYear && !IsExpired())
|
|---|
| | | {
|
|---|
| | | // LocalSave.SetInt("IsOpenLimitedTime", GetDayOfYear);
|
|---|
| | | redPointStre1.state = RedPointState.Simple;
|
|---|
| | |
|---|
| | | fileFormatVersion: 2 |
|---|
| | | guid: 80212c8f087439f4a8bd063acaf6d098 |
|---|
| | | guid: d0b00b50908bef240aab8e11fa0119e0 |
|---|
| | | folderAsset: yes |
|---|
| | | timeCreated: 1556337107 |
|---|
| | | timeCreated: 1556421759 |
|---|
| | | licenseType: Pro |
|---|
| | | DefaultImporter: |
|---|
| | | userData: |
|---|
