From 00c38d7881142738660b6c53c90afa00daf66d25 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 31 八月 2018 11:11:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Core/GameEngine/Model/Config/ItemConfig.cs.meta | 2
System/Welfare/OperationTimeHepler.cs | 39 ++++++---
Fight/Actor/AI/SampleAI.cs | 6 +
System/OpenServerActivity/FlashSaleWin.cs | 11 ++
Core/GameEngine/Model/Config/ItemConfig.cs | 149 +++++++++++++++++++------------------
System/Treasure/TreasureLevelUpWin.cs | 6
Fight/GameActor/GA_NpcFightBoss.cs | 8 --
Fight/GameActor/GActorFight.cs | 6 +
System/Welfare/ConsumeRebateWin.cs | 2
9 files changed, 130 insertions(+), 99 deletions(-)
diff --git a/Core/GameEngine/Model/Config/ItemConfig.cs b/Core/GameEngine/Model/Config/ItemConfig.cs
index 48b3914..2a21780 100644
--- a/Core/GameEngine/Model/Config/ItemConfig.cs
+++ b/Core/GameEngine/Model/Config/ItemConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: 绗簩涓栫晫
-// [ Date ]: Wednesday, August 01, 2018
+// [ Date ]: Friday, August 31, 2018
//--------------------------------------------------------
using UnityEngine;
@@ -9,8 +9,8 @@
namespace TableConfig {
- public partial class ItemConfig : ConfigBase {
-
+ public partial class ItemConfig : ConfigBase {
+
public int ID { get ; private set ; }
public int LV { get ; private set ; }
public string ItemName { get ; private set; }
@@ -21,6 +21,7 @@
public int UseLV { get ; private set ; }
public int CanSell { get ; private set ; }
public int CanTrade { get ; private set ; }
+ public int ComposeID { get ; private set ; }
public int CanDrop { get ; private set ; }
public int CanBind { get ; private set ; }
public int CDType { get ; private set ; }
@@ -79,16 +80,16 @@
public int Jump { get ; private set ; }
public int[] GetWay;
public string ItemTypeName { get ; private set; }
- public int[] UseCondiType;
+ public int[] UseCondiType;
- public override string getKey()
- {
- return ID.ToString();
+ public override string getKey()
+ {
+ return ID.ToString();
}
public override void Parse() {
- try
- {
+ try
+ {
ID=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0;
LV=IsNumeric(rawContents[1]) ? int.Parse(rawContents[1]):0;
@@ -109,137 +110,139 @@
CanTrade=IsNumeric(rawContents[9]) ? int.Parse(rawContents[9]):0;
- CanDrop=IsNumeric(rawContents[10]) ? int.Parse(rawContents[10]):0;
+ ComposeID=IsNumeric(rawContents[10]) ? int.Parse(rawContents[10]):0;
- CanBind=IsNumeric(rawContents[11]) ? int.Parse(rawContents[11]):0;
+ CanDrop=IsNumeric(rawContents[11]) ? int.Parse(rawContents[11]):0;
- CDType=IsNumeric(rawContents[12]) ? int.Parse(rawContents[12]):0;
+ CanBind=IsNumeric(rawContents[12]) ? int.Parse(rawContents[12]):0;
- CDTime=IsNumeric(rawContents[13]) ? int.Parse(rawContents[13]):0;
+ CDType=IsNumeric(rawContents[13]) ? int.Parse(rawContents[13]):0;
- GoldPrice=IsNumeric(rawContents[14]) ? int.Parse(rawContents[14]):0;
+ CDTime=IsNumeric(rawContents[14]) ? int.Parse(rawContents[14]):0;
- GoldPaperPrice=IsNumeric(rawContents[15]) ? int.Parse(rawContents[15]):0;
+ GoldPrice=IsNumeric(rawContents[15]) ? int.Parse(rawContents[15]):0;
- SilverPrice=IsNumeric(rawContents[16]) ? int.Parse(rawContents[16]):0;
+ GoldPaperPrice=IsNumeric(rawContents[16]) ? int.Parse(rawContents[16]):0;
- UseTag=IsNumeric(rawContents[17]) ? int.Parse(rawContents[17]):0;
+ SilverPrice=IsNumeric(rawContents[17]) ? int.Parse(rawContents[17]):0;
- Effect1=IsNumeric(rawContents[18]) ? int.Parse(rawContents[18]):0;
+ UseTag=IsNumeric(rawContents[18]) ? int.Parse(rawContents[18]):0;
- EffectValueA1=IsNumeric(rawContents[19]) ? int.Parse(rawContents[19]):0;
+ Effect1=IsNumeric(rawContents[19]) ? int.Parse(rawContents[19]):0;
- EffectValueB1=IsNumeric(rawContents[20]) ? int.Parse(rawContents[20]):0;
+ EffectValueA1=IsNumeric(rawContents[20]) ? int.Parse(rawContents[20]):0;
- EffectValueC1=IsNumeric(rawContents[21]) ? int.Parse(rawContents[21]):0;
+ EffectValueB1=IsNumeric(rawContents[21]) ? int.Parse(rawContents[21]):0;
- Effect2=IsNumeric(rawContents[22]) ? int.Parse(rawContents[22]):0;
+ EffectValueC1=IsNumeric(rawContents[22]) ? int.Parse(rawContents[22]):0;
- EffectValueA2=IsNumeric(rawContents[23]) ? int.Parse(rawContents[23]):0;
+ Effect2=IsNumeric(rawContents[23]) ? int.Parse(rawContents[23]):0;
- EffectValueB2=IsNumeric(rawContents[24]) ? int.Parse(rawContents[24]):0;
+ EffectValueA2=IsNumeric(rawContents[24]) ? int.Parse(rawContents[24]):0;
- EffectValueC2=IsNumeric(rawContents[25]) ? int.Parse(rawContents[25]):0;
+ EffectValueB2=IsNumeric(rawContents[25]) ? int.Parse(rawContents[25]):0;
- Effect3=IsNumeric(rawContents[26]) ? int.Parse(rawContents[26]):0;
+ EffectValueC2=IsNumeric(rawContents[26]) ? int.Parse(rawContents[26]):0;
- EffectValueA3=IsNumeric(rawContents[27]) ? int.Parse(rawContents[27]):0;
+ Effect3=IsNumeric(rawContents[27]) ? int.Parse(rawContents[27]):0;
- EffectValueB3=IsNumeric(rawContents[28]) ? int.Parse(rawContents[28]):0;
+ EffectValueA3=IsNumeric(rawContents[28]) ? int.Parse(rawContents[28]):0;
- EffectValueC3=IsNumeric(rawContents[29]) ? int.Parse(rawContents[29]):0;
+ EffectValueB3=IsNumeric(rawContents[29]) ? int.Parse(rawContents[29]):0;
- Effect4=IsNumeric(rawContents[30]) ? int.Parse(rawContents[30]):0;
+ EffectValueC3=IsNumeric(rawContents[30]) ? int.Parse(rawContents[30]):0;
- EffectValueA4=IsNumeric(rawContents[31]) ? int.Parse(rawContents[31]):0;
+ Effect4=IsNumeric(rawContents[31]) ? int.Parse(rawContents[31]):0;
- EffectValueB4=IsNumeric(rawContents[32]) ? int.Parse(rawContents[32]):0;
+ EffectValueA4=IsNumeric(rawContents[32]) ? int.Parse(rawContents[32]):0;
- EffectValueC4=IsNumeric(rawContents[33]) ? int.Parse(rawContents[33]):0;
+ EffectValueB4=IsNumeric(rawContents[33]) ? int.Parse(rawContents[33]):0;
- Effect5=IsNumeric(rawContents[34]) ? int.Parse(rawContents[34]):0;
+ EffectValueC4=IsNumeric(rawContents[34]) ? int.Parse(rawContents[34]):0;
- EffectValueA5=IsNumeric(rawContents[35]) ? int.Parse(rawContents[35]):0;
+ Effect5=IsNumeric(rawContents[35]) ? int.Parse(rawContents[35]):0;
- EffectValueB5=IsNumeric(rawContents[36]) ? int.Parse(rawContents[36]):0;
+ EffectValueA5=IsNumeric(rawContents[36]) ? int.Parse(rawContents[36]):0;
- EffectValueC5=IsNumeric(rawContents[37]) ? int.Parse(rawContents[37]):0;
+ EffectValueB5=IsNumeric(rawContents[37]) ? int.Parse(rawContents[37]):0;
- AddSkill1=IsNumeric(rawContents[38]) ? int.Parse(rawContents[38]):0;
+ EffectValueC5=IsNumeric(rawContents[38]) ? int.Parse(rawContents[38]):0;
- JobLimit=IsNumeric(rawContents[39]) ? int.Parse(rawContents[39]):0;
+ AddSkill1=IsNumeric(rawContents[39]) ? int.Parse(rawContents[39]):0;
- RealmLimit=IsNumeric(rawContents[40]) ? int.Parse(rawContents[40]):0;
+ JobLimit=IsNumeric(rawContents[40]) ? int.Parse(rawContents[40]):0;
- ItemColor=IsNumeric(rawContents[41]) ? int.Parse(rawContents[41]):0;
+ RealmLimit=IsNumeric(rawContents[41]) ? int.Parse(rawContents[41]):0;
- StarLevel=IsNumeric(rawContents[42]) ? int.Parse(rawContents[42]):0;
+ ItemColor=IsNumeric(rawContents[42]) ? int.Parse(rawContents[42]):0;
- MaxHoleCount=IsNumeric(rawContents[43]) ? int.Parse(rawContents[43]):0;
+ StarLevel=IsNumeric(rawContents[43]) ? int.Parse(rawContents[43]):0;
- CanBreak=IsNumeric(rawContents[44]) ? int.Parse(rawContents[44]):0;
+ MaxHoleCount=IsNumeric(rawContents[44]) ? int.Parse(rawContents[44]):0;
- MaxEndure=IsNumeric(rawContents[45]) ? int.Parse(rawContents[45]):0;
+ CanBreak=IsNumeric(rawContents[45]) ? int.Parse(rawContents[45]):0;
- EndureReduceType=IsNumeric(rawContents[46]) ? int.Parse(rawContents[46]):0;
+ MaxEndure=IsNumeric(rawContents[46]) ? int.Parse(rawContents[46]):0;
- BindType=IsNumeric(rawContents[47]) ? int.Parse(rawContents[47]):0;
+ EndureReduceType=IsNumeric(rawContents[47]) ? int.Parse(rawContents[47]):0;
- MaxSkillCnt=IsNumeric(rawContents[48]) ? int.Parse(rawContents[48]):0;
+ BindType=IsNumeric(rawContents[48]) ? int.Parse(rawContents[48]):0;
- ExpireTime=IsNumeric(rawContents[49]) ? int.Parse(rawContents[49]):0;
+ MaxSkillCnt=IsNumeric(rawContents[49]) ? int.Parse(rawContents[49]):0;
- MaxFitLV=IsNumeric(rawContents[50]) ? int.Parse(rawContents[50]):0;
+ ExpireTime=IsNumeric(rawContents[50]) ? int.Parse(rawContents[50]):0;
- SuiteiD=IsNumeric(rawContents[51]) ? int.Parse(rawContents[51]):0;
+ MaxFitLV=IsNumeric(rawContents[51]) ? int.Parse(rawContents[51]):0;
- DropinstantEffName = rawContents[52].Trim();
+ SuiteiD=IsNumeric(rawContents[52]) ? int.Parse(rawContents[52]):0;
- IconKey = rawContents[53].Trim();
+ DropinstantEffName = rawContents[53].Trim();
- ChangeOrd=IsNumeric(rawContents[54]) ? int.Parse(rawContents[54]):0;
+ IconKey = rawContents[54].Trim();
- Description = rawContents[55].Trim();
+ ChangeOrd=IsNumeric(rawContents[55]) ? int.Parse(rawContents[55]):0;
- QualityName = rawContents[56].Trim();
+ Description = rawContents[56].Trim();
- QualityEchoType=IsNumeric(rawContents[57]) ? int.Parse(rawContents[57]):0;
+ QualityName = rawContents[57].Trim();
- LimitSTR=IsNumeric(rawContents[58]) ? int.Parse(rawContents[58]):0;
+ QualityEchoType=IsNumeric(rawContents[58]) ? int.Parse(rawContents[58]):0;
- LimitPHY=IsNumeric(rawContents[59]) ? int.Parse(rawContents[59]):0;
+ LimitSTR=IsNumeric(rawContents[59]) ? int.Parse(rawContents[59]):0;
- LimitPNE=IsNumeric(rawContents[60]) ? int.Parse(rawContents[60]):0;
+ LimitPHY=IsNumeric(rawContents[60]) ? int.Parse(rawContents[60]):0;
- Template = rawContents[61].Trim();
+ LimitPNE=IsNumeric(rawContents[61]) ? int.Parse(rawContents[61]):0;
- DropItemPattern=IsNumeric(rawContents[62]) ? int.Parse(rawContents[62]):0;
+ Template = rawContents[62].Trim();
- SellTip=IsNumeric(rawContents[63]) ? int.Parse(rawContents[63]):0;
+ DropItemPattern=IsNumeric(rawContents[63]) ? int.Parse(rawContents[63]):0;
- BatchUse=IsNumeric(rawContents[64]) ? int.Parse(rawContents[64]):0;
+ SellTip=IsNumeric(rawContents[64]) ? int.Parse(rawContents[64]):0;
- Jump=IsNumeric(rawContents[65]) ? int.Parse(rawContents[65]):0;
+ BatchUse=IsNumeric(rawContents[65]) ? int.Parse(rawContents[65]):0;
- string[] GetWayStringArray = rawContents[66].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ Jump=IsNumeric(rawContents[66]) ? int.Parse(rawContents[66]):0;
+
+ string[] GetWayStringArray = rawContents[67].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
GetWay = new int[GetWayStringArray.Length];
for (int i=0;i<GetWayStringArray.Length;i++)
{
int.TryParse(GetWayStringArray[i],out GetWay[i]);
}
- ItemTypeName = rawContents[67].Trim();
+ ItemTypeName = rawContents[68].Trim();
- string[] UseCondiTypeStringArray = rawContents[68].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ string[] UseCondiTypeStringArray = rawContents[69].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
UseCondiType = new int[UseCondiTypeStringArray.Length];
for (int i=0;i<UseCondiTypeStringArray.Length;i++)
{
int.TryParse(UseCondiTypeStringArray[i],out UseCondiType[i]);
- }
- }
- catch (Exception ex)
- {
- DebugEx.Log(ex);
+ }
+ }
+ catch (Exception ex)
+ {
+ DebugEx.Log(ex);
}
}
diff --git a/Core/GameEngine/Model/Config/ItemConfig.cs.meta b/Core/GameEngine/Model/Config/ItemConfig.cs.meta
index 86a5c67..7eac071 100644
--- a/Core/GameEngine/Model/Config/ItemConfig.cs.meta
+++ b/Core/GameEngine/Model/Config/ItemConfig.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: cfc9e4de91b5b6741bf06e2003e353b9
-timeCreated: 1533107824
+timeCreated: 1535682711
licenseType: Pro
MonoImporter:
serializedVersion: 2
diff --git a/Fight/Actor/AI/SampleAI.cs b/Fight/Actor/AI/SampleAI.cs
index f7a74f6..83583d5 100644
--- a/Fight/Actor/AI/SampleAI.cs
+++ b/Fight/Actor/AI/SampleAI.cs
@@ -142,6 +142,12 @@
{
// 鑻遍泟鏄惁瀛樺湪
GA_Hero _hero = PlayerDatas.Instance.hero;
+
+ if (_hero == null)
+ {
+ return;
+ }
+
// 鎸佹湁鑰呮槸鍚﹀凡缁忔浜�
if (m_Owner == null
|| m_Owner.ActorInfo == null
diff --git a/Fight/GameActor/GA_NpcFightBoss.cs b/Fight/GameActor/GA_NpcFightBoss.cs
index 830b0c1..6b390c7 100644
--- a/Fight/GameActor/GA_NpcFightBoss.cs
+++ b/Fight/GameActor/GA_NpcFightBoss.cs
@@ -79,14 +79,6 @@
public override void RefreshLifeBar(uint value)
{
// 闈為�変腑鐘舵�佷笅涓嶅埛鏂�
- if (PlayerDatas.Instance.hero != null)
- {
- if (PlayerDatas.Instance.hero.SelectTarget != this)
- {
- return;
- }
- }
-
if (s_HpRefresh != null)
{
s_HpRefresh(ServerInstID, NpcConfig.NPCID, ActorInfo.RealHp, ActorInfo.RealMaxHp);
diff --git a/Fight/GameActor/GActorFight.cs b/Fight/GameActor/GActorFight.cs
index 6dd057d..5d6e527 100644
--- a/Fight/GameActor/GActorFight.cs
+++ b/Fight/GameActor/GActorFight.cs
@@ -251,6 +251,12 @@
GActor _attacker = GAMgr.Instance.GetBySID(m_AttackerSID);
+ if (_attacker == null)
+ {
+ m_Beating = false;
+ return;
+ }
+
float _dis = MathUtility.DistanceSqrtXZ(_attacker.Pos, _end);
if (m_PushOrPull)
diff --git a/System/OpenServerActivity/FlashSaleWin.cs b/System/OpenServerActivity/FlashSaleWin.cs
index 5645477..9cb348c 100644
--- a/System/OpenServerActivity/FlashSaleWin.cs
+++ b/System/OpenServerActivity/FlashSaleWin.cs
@@ -127,10 +127,17 @@
private void DisplaySurplusTime()
{
- var seconds = OperationTimeHepler.Instance.GetOperationSurplusTime(Operation.FlashSale);
+ OperationBase operationBase;
+ OperationTimeHepler.Instance.TryGetOperationTime(Operation.FlashSale, out operationBase);
+ var seconds = 0;
+ if (operationBase != null)
+ {
+ OperationFlashSale operation = operationBase as OperationFlashSale;
+ seconds = operation.GetSurplusTime(operation.IndexOfFlashShop());
+ }
if (seconds > 0)
{
- m_SurplusTime.text = TimeUtility.SecondsToDHMSCHS(seconds);
+ m_SurplusTime.text = Language.Get("LimitGift1", TimeUtility.SecondsToDHMSCHS(seconds));
}
else
{
diff --git a/System/Treasure/TreasureLevelUpWin.cs b/System/Treasure/TreasureLevelUpWin.cs
index 5ad6d2d..f33f7c7 100644
--- a/System/Treasure/TreasureLevelUpWin.cs
+++ b/System/Treasure/TreasureLevelUpWin.cs
@@ -592,17 +592,17 @@
StartBack();
return;
}
- if (!WindowJumpMgr.Instance.IsJumpState && model.exitRecord < 4)
+ if (!WindowJumpMgr.Instance.IsJumpState && model.exitRecord >= 4)
{
StartBack();
- model.exitRecord += 1;
+ model.exitRecord = 0;
return;
}
model.openFromTreasureList = false;
CloseImmediately();
if (!WindowJumpMgr.Instance.IsJumpState)
{
- model.exitRecord = 0;
+ model.exitRecord++;
WindowCenter.Instance.Open<MainInterfaceWin>();
}
}
diff --git a/System/Welfare/ConsumeRebateWin.cs b/System/Welfare/ConsumeRebateWin.cs
index 4576b79..80ef2a8 100644
--- a/System/Welfare/ConsumeRebateWin.cs
+++ b/System/Welfare/ConsumeRebateWin.cs
@@ -16,6 +16,7 @@
[SerializeField] Text m_OperationSurplusTime;
[SerializeField] Text m_OperationOpenTime;
[SerializeField] Text m_OperationSurplusTimeTitle;
+ [SerializeField] Text m_Rule;
[SerializeField] ScrollerController m_Controller;
@@ -133,6 +134,7 @@
m_Controller.AddCell(ScrollerDataType.Header, i);
}
}
+ m_Rule.gameObject.SetActive(operation.dayReset);
}
m_Controller.Restart();
}
diff --git a/System/Welfare/OperationTimeHepler.cs b/System/Welfare/OperationTimeHepler.cs
index 4c34713..340f5a6 100644
--- a/System/Welfare/OperationTimeHepler.cs
+++ b/System/Welfare/OperationTimeHepler.cs
@@ -253,6 +253,7 @@
operation.limitLv = package.LimitLV;
operation.startDate = ParseOperationDate(package.StartDate);
operation.endDate = ParseOperationDate(package.EndtDate);
+ operation.dateEnumerator = new OperationDateEnumerator(operation.startDate, operation.endDate);
operation.dayReset = package.IsDayReset == 1;
if (package.ActivityTimeCount == 0)
{
@@ -1065,17 +1066,12 @@
{
return 0;
}
- var _dayIndex = IndexOfOpenDay(TimeUtility.ServerNow);
- if (_dayIndex == -1)
- {
- return -1;
- }
var _timeIndex = IndexOfOpenTime(TimeUtility.ServerNow);
if (_timeIndex == -1)
{
return -1;
}
- return Mathf.Min(flashShops.Count - 1, allDay ? _dayIndex : _dayIndex * 2 + _timeIndex);
+ return Mathf.Min(flashShops.Count - 1, allDay ? 0 : _timeIndex);
}
public FlashSaleGift GetFlashSaleGift(int _index, int _id)
@@ -1117,6 +1113,30 @@
return textBuilder.ToString();
}
+ public int GetSurplusTime(int index)
+ {
+ if (!InTime(TimeUtility.ServerNow))
+ {
+ return 0;
+ }
+ var seconds = 0;
+ if (times.Count == 0)
+ {
+ DateTime endOperationTime = new DateTime(TimeUtility.Year, TimeUtility.Month,
+ TimeUtility.Day, 0, 0, 0);
+ endOperationTime = endOperationTime.AddDays(1);
+ seconds = (int)(endOperationTime - TimeUtility.ServerNow).TotalSeconds;
+ }
+ if (index >= 0 && index < times.Count)
+ {
+ var _endTime = times[index];
+ DateTime endOperationTime = new DateTime(TimeUtility.Year, TimeUtility.Month,
+ TimeUtility.Day, _endTime.endHour, _endTime.endMinute, 0);
+ seconds = (int)(endOperationTime - TimeUtility.ServerNow).TotalSeconds;
+ }
+ return seconds;
+ }
+
public struct FlashSale
{
public FlashSaleGift[] gifts;
@@ -1154,17 +1174,12 @@
{
return 0;
}
- var _dayIndex = IndexOfOpenDay(TimeUtility.ServerNow);
- if (_dayIndex == -1)
- {
- return -1;
- }
var _timeIndex = IndexOfOpenTime(TimeUtility.ServerNow);
if (_timeIndex == -1)
{
return -1;
}
- return Mathf.Min(giftpackage1.Count - 1, allDay ? _dayIndex : _dayIndex * 2 + _timeIndex);
+ return Mathf.Min(giftpackage1.Count - 1, allDay ? 0 : _timeIndex);
}
public GiftPackageGift GetFlashSaleGift(int _index, int _id)
--
Gitblit v1.8.0