update data

json/gamedata/ko_KR/gamedata/levels/activities/act14side/level_act14side_01.json

@@ -1860,4 +1860,4 @@
   "excludeCharIdList": null,
   "randomSeed": 2112443903,
   "operaConfig": null
-}
+}

json/gamedata/ko_KR/gamedata/levels/activities/act14side/level_act14side_02.json

@@ -2468,4 +2468,4 @@
   "excludeCharIdList": null,
   "randomSeed": 1316148123,
   "operaConfig": null
-}
+}

json/gamedata/ko_KR/gamedata/levels/activities/act14side/level_act14side_03.json

@@ -1699,4 +1699,4 @@
   "excludeCharIdList": null,
   "randomSeed": 985685264,
   "operaConfig": null
-}
+}

json/gamedata/ko_KR/gamedata/levels/activities/act14side/level_act14side_04.json

@@ -2296,4 +2296,4 @@
   "excludeCharIdList": null,
   "randomSeed": 655045626,
   "operaConfig": null
-}
+}

json/gamedata/ko_KR/gamedata/levels/activities/act14side/level_act14side_05.json

@@ -2148,4 +2148,4 @@
   "excludeCharIdList": null,
   "randomSeed": 1727655211,
   "operaConfig": null
-}
+}

json/gamedata/ko_KR/gamedata/levels/activities/act14side/level_act14side_06.json

@@ -4301,4 +4301,4 @@
   "excludeCharIdList": null,
   "randomSeed": 66187062,
   "operaConfig": null
-}
+}

json/gamedata/ko_KR/gamedata/levels/activities/act14side/level_act14side_07.json

@@ -2626,4 +2626,4 @@
   "excludeCharIdList": null,
   "randomSeed": 1515857223,
   "operaConfig": null
-}
+}

json/gamedata/ko_KR/gamedata/levels/activities/act14side/level_act14side_08.json

@@ -1846,4 +1846,4 @@
   "excludeCharIdList": null,
   "randomSeed": 769305112,
   "operaConfig": null
-}
+}

json/gamedata/ko_KR/gamedata/levels/activities/act14side/level_act14side_ex01.json

@@ -2830,4 +2830,4 @@
   "excludeCharIdList": null,
   "randomSeed": 66517250,
   "operaConfig": null
-}
+}

json/gamedata/ko_KR/gamedata/levels/activities/act14side/level_act14side_ex02.json

@@ -3452,4 +3452,4 @@
   "excludeCharIdList": null,
   "randomSeed": 302936691,
   "operaConfig": null
-}
+}

json/gamedata/ko_KR/gamedata/levels/activities/act14side/level_act14side_ex03.json

@@ -3853,4 +3853,4 @@
   "excludeCharIdList": null,
   "randomSeed": 1584064004,
   "operaConfig": null
-}
+}

json/gamedata/ko_KR/gamedata/levels/activities/act14side/level_act14side_ex04.json

@@ -4097,4 +4097,4 @@
   "excludeCharIdList": null,
   "randomSeed": 1076590626,
   "operaConfig": null
-}
+}

json/gamedata/ko_KR/gamedata/levels/activities/act14side/level_act14side_ex05.json

@@ -2568,4 +2568,4 @@
   "excludeCharIdList": null,
   "randomSeed": 1465589513,
   "operaConfig": null
-}
+}

json/gamedata/ko_KR/gamedata/levels/activities/act14side/level_act14side_ex06.json

@@ -2700,4 +2700,4 @@
   "excludeCharIdList": null,
   "randomSeed": 1187069412,
   "operaConfig": null
-}
+}

json/gamedata/ko_KR/gamedata/levels/activities/act14side/level_act14side_ex07.json

@@ -1845,4 +1845,4 @@
   "excludeCharIdList": null,
   "randomSeed": 1345836240,
   "operaConfig": null
-}
+}

json/gamedata/ko_KR/gamedata/levels/activities/act14side/level_act14side_ex08.json

@@ -2948,4 +2948,4 @@
   "excludeCharIdList": null,
   "randomSeed": 1950508133,
   "operaConfig": null
-}
+}

json/gamedata/ko_KR/gamedata/levels/activities/act14side/level_act14side_tr01.json

@@ -1729,4 +1729,4 @@
   "excludeCharIdList": null,
   "randomSeed": 877526509,
   "operaConfig": null
-}
+}

json/gamedata/ko_KR/gamedata/levels/activities/act14side/level_act14side_tr02.json

@@ -2088,4 +2088,4 @@
   "excludeCharIdList": null,
   "randomSeed": 877526509,
   "operaConfig": null
-}
+}

json/gamedata/zh_CN/gamedata/[uc]lua/base/dialog/uidlggroup.lua

@@ -25,20 +25,25 @@ function UIDlgGroup:InitList(dlgClsList)
     if idx == #dlgClsList then
       self:AddChildDlg(dlgCls);
     else
-      self:AddChildDlgImmediatly(dlgCls);
+      local child = self:AddChildDlgImmediatly(dlgCls);
+      if child ~= nil then
+        child:SetVisible(false);
+      end
     end
   end
 end
 
+
 function UIDlgGroup:AddChildDlgImmediatly(dlgCls)
   if self:_CheckTransitting() then
-    return;
+    return nil;
   end
   local newAdd, preDlg = self:_HandleAdd(dlgCls);
   newAdd:TransImmediatly(true);
   if preDlg then
     preDlg:SetVisible(false);
   end
+  return newAdd;
 end
 
 function UIDlgGroup:AddChildDlg(dlgCls)

json/gamedata/zh_CN/gamedata/[uc]lua/base/dialog/uirecycleadapterbase.lua

@@ -56,6 +56,7 @@ function UIRecycleAdapterBase:NotifyRebuild()
   self.m_layout:NotifyRebuild()
 end
 
+
 function UIRecycleAdapterBase:NotifyDataChanged()
   self.m_layout:NotifyDataChanged()
 end

json/gamedata/zh_CN/gamedata/[uc]lua/base/utils/miscutil.lua

@@ -123,4 +123,16 @@ function YieldWaitForSeconds(seconds)
   while CS.UnityEngine.Time.time < startTime + seconds do
     coroutine.yield();
   end
+end
+
+
+
+function AsignItemCardClickDelegate(uibase, itemCard)
+  if itemCard:GetComponent("Torappu.UI.UIItemCard") ~= nil then
+    uibase:AsignDelegate(itemCard, "onItemClick", function(this, index)
+      CS.Torappu.UI.UIItemDescFloatController.ShowItemDesc(itemCard.gameObject, itemCard.model)
+    end)
+  else
+    LogError("input gameobject should have UIItemCard Component")
+  end
 end

json/gamedata/zh_CN/gamedata/[uc]lua/feature/featuremodule.lua

@@ -52,6 +52,14 @@ require "Feature/Activity/MainlineBuff/MainlineBuffMainDlg"
 
 require "Feature/Wardrobe/WardrobeModule"
 
+require "Feature/Operation/ReturnV2/ReturnV2Model";
+require "Feature/Operation/ReturnV2/ReturnV2MainDlgViewModel"
+require "Feature/Operation/ReturnV2/ReturnV2MainDlg";
+require "Feature/Operation/ReturnV2/ReturnV2Define";
+require "Feature/Operation/ReturnV2/ReturnV2WelcomeDlg"
+require "Feature/Operation/ReturnV2/ReturnV2RewardsDlg"
+require "Feature/Operation/ReturnV2/ReturnV2TrackPoint";
+
 require "Feature/Operation/Returnning/ReturnDefine"
 require "Feature/Operation/Returnning/ReturnService"
 require "Feature/Operation/Returnning/ReturnModel"

json/gamedata/zh_CN/gamedata/[uc]lua/feature/operation/returnning/returnmodel.lua

@@ -188,17 +188,43 @@ function ReturnModel:GetReturnStatus()
     showTrackPoint = false;
     onlyWeekly = false;
   }
-  status.open = CS.Torappu.PlayerData.instance.data.backflow.open;
-  if status.open then
+  local playerData = CS.Torappu.PlayerData.instance.data.backflow;
+  if playerData == nil then
+    status.open = false;
+    return status;
+  else
+    status.open = playerData.open;
+  end
+
+  local returnV2Model = ReturnV2Model.me;
+  local useOld = self:GetReturnVersion();
+  if not useOld then
+    status.open = status.open and returnV2Model:IsReturnV2Show(playerData);
+  end
+  if not status.open then
+    return status;
+  end
+
+  if useOld then
     status.onlyWeekly = self:CheckIfOnlyWeeklyOpen();
     status.shouldPopup = self:_CheckIfPopupReturnPage();
     status.showTrackPoint = not status.onlyWeekly and self:_CheckShowTrackPoint();
+  else
+    status.onlyWeekly = returnV2Model:CheckIfOnlyWeeklyOpen(playerData);
+    status.shouldPopup = returnV2Model:CheckIfPopupReturnPage();
+    status.showTrackPoint = not status.onlyWeekly and returnV2Model:CheckShowTrackPoint();
   end
 
   return status;
 end
 
 
+function ReturnModel:GetReturnVersion()
+  return CS.Torappu.PlayerData.instance.data.backflow == nil or 
+      CS.Torappu.PlayerData.instance.data.backflow.version == nil or
+      CS.Torappu.PlayerData.instance.data.backflow.version == CS.Torappu.PlayerReturnData.Version.OLD;
+end
+
 function ReturnModel:_CheckIfPopupReturnPage()
 
 

json/gamedata/zh_CN/gamedata/[uc]lua/feature/operation/returnning/returnpagedlg.lua

@@ -1,28 +1,43 @@
 
 
+
 ReturnPageDlg = DlgMgr.DefineDialog("ReturnPageDlg", "Operation/Returnning/return_page_dlg", BridgeDlgBase);
 
 function ReturnPageDlg:OnInit()
   self:SetPureGroup();
   self:AddButtonClickListener(self._btnClose, self._EventOnClose);
 
-  local initDlgStack = {ReturnMainDlg};
-  local hasOnceReward = ReturnModel.me:HasOnceReward();
-  if hasOnceReward then
-    table.insert(initDlgStack, ReturnWelcomeDlg);
-  end
-  self:GetGroup():InitList(initDlgStack);
-
-  if not hasOnceReward and ReturnModel.me:CheckIfNeedReadIntro() then
-    ReturnModel.me:ShowGuide(true);
+  self.m_useOld = ReturnModel.me:GetReturnVersion()
+
+  if self.m_useOld then
+    local initDlgStack = {ReturnMainDlg};
+    local hasOnceReward = ReturnModel.me:HasOnceReward();
+    if hasOnceReward then
+      table.insert(initDlgStack, ReturnWelcomeDlg);
+    end
+    self:GetGroup():InitList(initDlgStack);
+
+    if not hasOnceReward and ReturnModel.me:CheckIfNeedReadIntro() then
+      ReturnModel.me:ShowGuide(true);
+    end
+  else
+    local initDlgStack = { ReturnV2MainDlg };
+    local hasOnceReward = ReturnV2Model.me:HasOnceReward();
+    if hasOnceReward then
+      table.insert(initDlgStack, ReturnV2WelcomeDlg);
+    end
+    self:GetGroup():InitList(initDlgStack);
   end
 end
 
 function ReturnPageDlg:OnResume()
-  ReturnModel.me:SetAlreadyPopup();
+  if self.m_useOld then
+    ReturnModel.me:SetAlreadyPopup()
+  else
+    ReturnV2Model.me:SetAlreadyPopup()
+  end
 end
 
 function ReturnPageDlg:_EventOnClose()
-  print("xxxxxx");
   self:Close();
 end

json/gamedata/zh_CN/gamedata/[uc]lua/feature/supportor/layouts/uisimplelayoutadapter.lua

@@ -6,6 +6,7 @@
 
 
 
+
 UISimpleLayoutAdapter = Class("UISimpleLayoutAdapter")
 
 
@@ -14,11 +15,13 @@ UISimpleLayoutAdapter = Class("UISimpleLayoutAdapter")
 
 
 
-function UISimpleLayoutAdapter:Initialize(host, layout, createWidgetFunc ,getCountFunc, updateViewFunc)
+
+function UISimpleLayoutAdapter:Initialize(host, layout, createWidgetFunc, getCountFunc, updateViewFunc, overridePrefab)
   self.m_host = host
   self.m_createWidgetFunc = createWidgetFunc
   self.m_getCountFunc = getCountFunc
   self.m_updateViewFunc = updateViewFunc
+  self.m_overridePrefab = overridePrefab;
   self.m_viewList = {}
   self:_BindToLayout(layout);
 end
@@ -68,6 +71,11 @@ function UISimpleLayoutAdapter:UpdateView(index, gameObj)
   end
 end
 
+
+function UISimpleLayoutAdapter:GetOverridePrefab()
+  return self.m_overridePrefab;
+end
+
 function UISimpleLayoutAdapter:NotifyDataSetChanged()
   if not self.m_bridge then
     return
@@ -93,4 +101,4 @@ function UISimpleLayoutAdapter:_FindViewByObj(gameObj)
     end
   end
   return nil
-end
+end

json/gamedata/zh_CN/gamedata/[uc]lua/globalconfig.lua

@@ -1,6 +1,6 @@
 GlobalConfig = 
 {
-  CUR_FUNC_VER = "V039",
+  CUR_FUNC_VER = "V040",
 }
 
 

json/gamedata/zh_CN/gamedata/[uc]lua/hotfixes/definedfix.lua

@@ -3,7 +3,6 @@ local list =
 {
 
   "HotFixes/ShopHotfixer",
-  "HotFixes/EnemyHandbookHotfixer",
 };
 
 return list;