|
@@ -110,7 +110,7 @@ namespace GFGGame
|
|
protected override void AddEventListener()
|
|
protected override void AddEventListener()
|
|
{
|
|
{
|
|
base.AddEventListener();
|
|
base.AddEventListener();
|
|
- EventAgent.AddEventListener(ConstMessage.CARD_CHOOSE, StartCalculateScore);
|
|
|
|
|
|
+ EventAgent.AddEventListener(ConstMessage.CARD_CHOOSE, OnClickBtnPhotograph);
|
|
EventAgent.AddEventListener(ConstMessage.DRESS_FILTER, UpdatePartsListSort);
|
|
EventAgent.AddEventListener(ConstMessage.DRESS_FILTER, UpdatePartsListSort);
|
|
EventAgent.AddEventListener(ConstMessage.DRESS_SEARCH, UpdatePartsListSort);
|
|
EventAgent.AddEventListener(ConstMessage.DRESS_SEARCH, UpdatePartsListSort);
|
|
EventAgent.AddEventListener(ConstMessage.DRESS_UP_SCORE_CHANGED, UpdateScore);
|
|
EventAgent.AddEventListener(ConstMessage.DRESS_UP_SCORE_CHANGED, UpdateScore);
|
|
@@ -208,7 +208,7 @@ namespace GFGGame
|
|
protected override void RemoveEventListener()
|
|
protected override void RemoveEventListener()
|
|
{
|
|
{
|
|
base.RemoveEventListener();
|
|
base.RemoveEventListener();
|
|
- EventAgent.RemoveEventListener(ConstMessage.CARD_CHOOSE, StartCalculateScore);
|
|
|
|
|
|
+ EventAgent.RemoveEventListener(ConstMessage.CARD_CHOOSE, OnClickBtnPhotograph);
|
|
EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER, UpdatePartsListSort);
|
|
EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER, UpdatePartsListSort);
|
|
EventAgent.RemoveEventListener(ConstMessage.DRESS_SEARCH, UpdatePartsListSort);
|
|
EventAgent.RemoveEventListener(ConstMessage.DRESS_SEARCH, UpdatePartsListSort);
|
|
EventAgent.RemoveEventListener(ConstMessage.DRESS_UP_SCORE_CHANGED, UpdateScore);
|
|
EventAgent.RemoveEventListener(ConstMessage.DRESS_UP_SCORE_CHANGED, UpdateScore);
|
|
@@ -438,14 +438,14 @@ namespace GFGGame
|
|
tex.ReadPixels(rect, 0, 0);//读取像素,屏幕左下角为0点
|
|
tex.ReadPixels(rect, 0, 0);//读取像素,屏幕左下角为0点
|
|
tex.Apply();//保存像素信息
|
|
tex.Apply();//保存像素信息
|
|
NTexture _nTexture = new NTexture(tex);
|
|
NTexture _nTexture = new NTexture(tex);
|
|
- EquipDataCache.cacher.nTexture = _nTexture;
|
|
|
|
|
|
+ // EquipDataCache.cacher.nTexture = _nTexture;
|
|
GRoot.inst.visible = true;
|
|
GRoot.inst.visible = true;
|
|
bg.SetActive(true);
|
|
bg.SetActive(true);
|
|
Camera.main.backgroundColor = backgroundColor;
|
|
Camera.main.backgroundColor = backgroundColor;
|
|
|
|
|
|
- StartCalculateScore();
|
|
|
|
|
|
+ StartCalculateScore(_nTexture);
|
|
}
|
|
}
|
|
- private void StartCalculateScore()
|
|
|
|
|
|
+ private void StartCalculateScore(NTexture nTexture)
|
|
{
|
|
{
|
|
//不可移动代码位置
|
|
//不可移动代码位置
|
|
bool hasFightTarget = _fightCfg.targetName != null && _fightCfg.targetName.Length > 0;
|
|
bool hasFightTarget = _fightCfg.targetName != null && _fightCfg.targetName.Length > 0;
|