Commit Graph

358 Commits (74c2f67d10c8c2b4ba5641c477e46f042b021485)

Author SHA1 Message Date
wangzhenxing 91ace072a2 [功能]=====车迟斗法开服7日后开启 2022-03-28 15:29:10 +08:00
gaoxin 5a66722aed 【无尽副本】优化清除缓存第一次进入无尽副本时任务状态错误 2022-01-19 18:32:43 +08:00
gaoxin 455cdcd19c 【日常副本】列表动画添加 2022-01-13 12:04:22 +08:00
jiaoyangna c8b604bde4 【ID1011007】
【优化】功能开启增加新条件类型
2022-01-06 11:30:35 +08:00
gaoxin e901bd9d3b 【轩辕宝镜】通关到最后一层,打开界面时列表位置没有固定在最新关 2021-12-30 22:37:35 +08:00
gaoxin 5557795658 【轩辕宝镜】偶现跨0点报错 2021-11-26 10:53:49 +08:00
gaoxin ad3ca2e0d2 【战斗】新增轩辕宝镜,僧罗幻境战斗类型,四灵试炼回放改为回放类型 2021-11-26 10:19:29 +08:00
ZhangBiao 12e46be512 【装备界面】提交 2021-11-09 10:22:16 +08:00
ZhangBiao ea4661b254 【无尽副本】修改 2021-11-05 15:50:49 +08:00
ZhangBiao cd8f61cbed 【无尽副本】行动力不减修复 2021-11-05 10:04:32 +08:00
ZhangBiao 8f2398c932 【山河社稷图优化】优化选关界面操作 2021-11-02 17:22:42 +08:00
ZhangBiao 19a67875f8 【界面优化】大闹天宫部分 2021-10-27 13:45:05 +08:00
ZhangBiao ac23ef4dbd 【界面优化】竞技场主界面、轩辕宝镜、抽到灵兽界面 2021-10-27 10:37:29 +08:00
wangzhenxing a7f0c42cae Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
	Assets/ManagedResources/~Lua/Data/UIData.lua
	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
	Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
	Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua
	Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua
	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
	Assets/ManagedResources/~Lua/View/UpView.lua
2021-09-18 11:52:01 +08:00
gaoxin 16633b37a8 【编队优化】 2021-09-10 16:25:38 +08:00
gaoxin 3e3d0d9416 Merge remote-tracking branch 'origin/china/xq' into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
#	Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua
2021-09-09 11:22:47 +08:00
gaoxin c4bced89f7 【战斗校验】山河社稷图,跨服战斗,地图战斗添加战斗校验 2021-09-08 18:27:20 +08:00
jiaoyangna 4f266a20b9 红点问题修改提交 2021-09-01 14:17:21 +08:00
jiaoyangna ab1a4ea627 Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-08-26 17:42:25 +08:00
gaoxin 2f9357608a 【太初密卷】修改为拉伸的方式 2021-08-26 16:30:52 +08:00
gaoxin eebd99883b 【优化】添加判断物体是否被销毁的方法,优化可能导致黑屏卡死的问题 2021-08-25 20:59:26 +08:00
jiaoyangna 0c7e38a715 Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-08-25 15:25:54 +08:00
jiaoyangna 404a30a57d 四灵修改提交 2021-08-25 15:15:50 +08:00
gaoxin f778b03879 【打开网页】添加打开内置浏览器和外部浏览器的配置,解决老包无法打开网页的问题 2021-08-25 14:27:08 +08:00
jiaoyangna 51d1ea2524 太初秘卷图片修改 2021-08-16 11:25:45 +08:00
jiaoyangna 39f355c0d1 适配修改提交 2021-08-12 18:35:23 +08:00
jiaoyangna 5c4696ad6c 太初秘卷修改提交 2021-08-12 17:32:34 +08:00
jiaoyangna 76dbc01270 Merge branch 'china/dev' into 0功能/silingshilian 2021-08-12 15:54:58 +08:00
jiaoyangna 792b533fa0 太初秘卷修改提交 2021-08-12 11:02:21 +08:00
jiaoyangna c3d45f1316 【ID1010059】
【新功能】太初密卷
2021-08-11 15:15:41 +08:00
ZhangBiao d7aa6d66f9 【无尽副本】特效穿透提交 2021-08-09 17:35:22 +08:00
jiaoyangna 6b8c2f2f3c Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Common/CardRendererRoot.prefab
#	Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
#	Assets/ManagedResources/RTexture/CardTexture10.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture11.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture12.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture7.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture8.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture9.renderTexture.meta
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Framework/Manager/CardRendererManager.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua
#	Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
2021-08-06 11:15:13 +08:00
ZhangBiao 68466c0fff 【副本界面】按钮调整 2021-07-29 11:18:53 +08:00
ZhangBiao e1ae3e3bf3 【副本界面】按下区域大小调整 2021-07-29 10:09:02 +08:00
ZhangBiao 9a7ef2f0a2 【轩辕宝境】从任意一个宝境里返回轩辕宝境主界面,顶部资源条消失 2021-07-24 17:45:48 +08:00
ZhangBiao 8a90b87942 【新副本界面】心魔次数文字错误修改,和弹窗修改 2021-07-23 17:43:30 +08:00
ZhangBiao 627954ae3f 【大闹天宫】层数错误提交 2021-07-23 17:26:24 +08:00
ZhangBiao bd5b473246 【大闹天宫】增加层数显示 2021-07-23 15:55:49 +08:00
ZhangBiao 3eee03aca7 【新副本界面】等级提示错误修复 2021-07-23 14:55:33 +08:00
ZhangBiao b5fd7ba8f6 【新副本界面】刷新时间和引导修改 2021-07-23 14:11:29 +08:00
ZhangBiao db258d27cb 【副本界面】调整 2021-07-22 15:13:24 +08:00
ZhangBiao 88bd6a9801 【新副本】完成? 2021-07-15 19:46:43 +08:00
ZhangBiao dd8f907259 【副本界面】提交 2021-07-15 15:54:18 +08:00
ZhangBiao e3baabda96 【副本界面】特效提交 2021-07-15 15:25:25 +08:00
ZhangBiao 3764ac753b 【新副本】界面时间显示调整 2021-07-08 10:15:39 +08:00
ZhangBiao 6950b52db9 【新副本】基本完成 2021-07-07 17:05:32 +08:00
ZhangBiao 3732c7c4ca 【新副本】界面提交 2021-07-07 14:43:37 +08:00
ZhangBiao a711f13642 【新副本】资源重新提交 2021-07-07 13:50:11 +08:00
ZhangBiao 6a3c7903f5 【新副本】资源提交 2021-07-06 18:32:23 +08:00
ZhangBiao e64223b78b 【副本】新界面提交 2021-07-06 16:30:58 +08:00
ZhangBiao 7b66ae5db4 【副本】新界面 2021-07-06 14:47:10 +08:00
ZhangBiao 3620c4095e 【副本】新副本界面开坑 2021-07-06 11:55:21 +08:00
jiaoyangna a1584af31c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-01 15:55:07 +08:00
ZhangBiao fb7c5c69fd 【森罗幻境】提交 2021-07-01 15:43:50 +08:00
ZhangBiao 36ccbe968b 【森罗幻境】排行榜信息冗余修改 2021-07-01 15:42:23 +08:00
jiaoyangna b395550303 【ID1016634】
【无尽副本】有没领取的任务,在线刷新无尽副本后,任务显示可领取
2021-07-01 15:40:44 +08:00
jiaoyangna 8115705d1a 【ID1016422】
【无尽副本】自动恢复行动力倒计时结束后,行动力不增加
2021-06-10 16:30:49 +08:00
jiaoyangna f5a9a1368d 【ID1016422】
【无尽副本】自动恢复行动力倒计时结束后,行动力不增加
2021-06-10 16:08:26 +08:00
zhangqiang b3578a5ba4 【音效】跳转不同界面再返回,音效没有跟着切换 2021-06-10 14:50:28 +08:00
jiaoyangna 70cc891df2 【ID1009443】
【无尽副本】地图描述同时根据地图ID和当前玩家所在等级段来读取,并根据不同等级段读取副本标题
2021-06-09 18:14:26 +08:00
jiaoyangna c40c6640c9 【ID1009443】
【无尽副本】地图描述同时根据地图ID和当前玩家所在等级段来读取,并根据不同等级段读取副本标题
2021-06-09 18:02:05 +08:00
jiaoyangna 20d50b84f2 ID1009443】
【无尽副本】地图描述同时根据地图ID和当前玩家所在等级段来读取
2021-06-09 17:51:54 +08:00
jiaoyangna 2534a2110b 无尽提交 2021-06-02 18:20:38 +08:00
jiaoyangna 32750ffa34 【无尽副本】未激活五星神将或未选择五星神将不允许进入地图 2021-06-01 17:10:07 +08:00
jiaoyangna 5bc754678e 报错修改 2021-05-31 20:39:46 +08:00
jiaoyangna 68d39a1d5e 森罗修改提交 2021-05-28 16:10:44 +08:00
jiaoyangna edd52b5eaa 【无尽副本】体力刷新倒计时结束后,页面计时显示不重置,退出重进显示正常 2021-05-28 14:45:42 +08:00
jiaoyangna d9773587a5 修改提交 2021-05-28 10:35:01 +08:00
jiaoyangna 4b33fee287 红点修改提交 2021-05-28 10:20:13 +08:00
jiaoyangna 1e247043ac Merge branch '0优化/无尽副本' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-05-27 19:42:22 +08:00
jiaoyangna 666f77c3db 无尽修改提交 2021-05-27 17:34:59 +08:00
gaoxin 417a46815f 【日常副本】资源替换 2021-05-27 14:56:18 +08:00
jiaoyangna 35d0927881 无尽副本修改提交 2021-05-26 22:00:33 +08:00
jiaoyangna 618d8094ea 无尽副本修改提交 2021-05-26 17:27:47 +08:00
zhangqiang 945ee5a968 【bug提交】 2021-05-26 15:47:29 +08:00
jiaoyangna c95211428b Merge branch 'china/dev-c' into 0优化/无尽副本
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-05-26 11:55:14 +08:00
jiaoyangna e3c4ac2440 无尽副本战力修改提交 2021-05-26 11:52:32 +08:00
zhangqiang da9aeed441 【心魔试炼】提交 2021-05-26 11:48:44 +08:00
jiaoyangna da6dd0283c 编队修改提交 2021-05-25 20:37:12 +08:00
jiaoyangna a112127db0 无尽副本修改提交 2021-05-25 18:07:53 +08:00
jiaoyangna 5fb2aa23ce 无尽副本修改提交 2021-05-25 16:20:56 +08:00
jiaoyangna 33834cc9b2 Merge branch 'china/dev-c' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Atlas/FourElement.meta
#	Assets/ManagedResources/Atlas/FourElement/ArtFont/s_silingshilian_yitongguan_zh.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_daodi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_di.jpg.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_fodi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_rendi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_renjieshiliandi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_shilianjianglidi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_shoudi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_yaodi.png.meta
#	Assets/ManagedResources/LuaBytes.meta
#	Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleListPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua.meta
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralRewardPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
#	Assets/ManagedResources/~Lua/View/ScrollCycleView.lua
2021-05-24 16:39:34 +08:00
jiaoyangna c22e26a5f5 Merge branch 'china/dev-c' into 0优化/无尽副本
# Conflicts:
#	Assets/ManagedResources/Atlas/FuXingGaoZhao/f_fuxinggaozhao_1888.png.meta
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua
2021-05-24 13:53:28 +08:00
jiaoyangna a10ec722e5 无尽副本提交 2021-05-24 11:51:11 +08:00
jiaoyangna 30a6a41fe6 无尽副本修改提交 2021-05-21 16:39:08 +08:00
gaoxin 1b873eb38d Merge branch 'china/dev-c' into china/ios
# Conflicts:
#	Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_zida_en.png.meta
#	Assets/ManagedResources/ArtFont_en/n_niuqichongchong_banner_en.png.meta
#	Assets/ManagedResources/ArtFont_en/n_niuqichongchong_niuqizhi_en.png.meta
#	Assets/ManagedResources/ArtFont_en/q_qinlongmibao_banner1_en.png.meta
#	Assets/ManagedResources/ArtFont_en/r_fabao_guiyuan_en.png.meta
#	Assets/ManagedResources/ArtFont_en/sl_en.png.meta
#	Assets/ManagedResources/ArtFont_en/x_xianshizaohuan_wujiangyulan 1_en.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_1_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_2_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_3_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_4_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_6_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_7_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_8_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_9_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_banner_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_niuqizhi_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/q_qinlongmibao_banner1_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/r_fabao_guiyuan_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/sl_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_2_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/w_wj_banner_vi.png.meta
#	Assets/ManagedResources/Atlas/BattleAtlas/r_zhandou_leiquehei_01.png.meta
#	Assets/ManagedResources/Atlas/DyAct_Activity7/timelimit_putishushen2.png.meta
#	Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/t_tongqiangtiebi_banner_zh.jpg.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/QiKaiDeSheng/q_qikaidesheng_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangLongFuHu/x_xianglongfuhu_shenjiang3.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YiShanDaoHai/y_yishandaohai_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_100_zh.png.meta
#	Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-congzhi_zh.png.meta
#	Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2.png.meta
#	Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2_gouxuan.png.meta
#	Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_01_zh.png.meta
#	Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_zh.png.meta
#	Assets/ManagedResources/Atlas/TimeLimitSkinAtlas/ArtFont/sl_zh.png.meta
#	Assets/ManagedResources/BG/t_tapolingxiao_beijingtu.png.meta
#	Assets/ManagedResources/DynamicAtlas/b_bianhuanmoce_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/b_bowenduoshi_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/p_pozhengzhuxian_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/q_qikaidesheng_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/s_yongwangzhiqian_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/y_yishandaohai_banner_zh.png
#	Assets/ManagedResources/EffectResUI/Story/Texture/UI_fuzhou_02.png.meta
#	Assets/ManagedResources/EffectResUI/Story/Texture/dianjijiekai.png.meta
#	Assets/ManagedResources/EffectResUI/Story/Texture/star_png.png.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua
#	Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua
#	Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
#	Assets/ManagedResources/~Lua/Modules/Login/ServerListItem.lua
#	Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
#	Assets/ManagedResources/~Lua/View/PlayerInfoView.lua
2021-05-19 14:12:37 +08:00
gaoxin b7b3f610ed 【翻译文字导出】 2021-05-11 17:03:09 +08:00
ZhangBiao 02be5bb730 【森罗幻境】boss不生成修改 2021-05-07 15:10:06 +08:00
ZhangBiao 782588b1ef 【森罗幻境】修复打boss弹出恭喜获得弹窗 2021-05-07 11:43:37 +08:00
wangzhenxing 2d87367728 副本入口图片位置修改提交 2021-04-27 16:31:32 +08:00
gaoxin fe6a38cbad 【轩辕宝境】进入界面时,当前不开放的宝境入口也会亮起1S左右 2021-04-27 16:00:24 +08:00
wangzhenxing 8bece9b87b 副本入口立绘位置修改 2021-04-25 14:25:40 +08:00
gaoxin 3e3f5888d0 【白片】添加一些debug日志 2021-04-23 11:42:27 +08:00
gaoxin fa61ea1317 【ios推荐服】白片处理,修复无尽副本无法返回,修复副本回到主界面点击其他页签黑屏 2021-04-22 20:39:30 +08:00
gaoxin 12856c1287 【ui】修复跳转后导致tip报错 2021-04-22 16:50:45 +08:00
gaoxin 80a2b1a1f3 【跳转】跳转到大页签时强制关闭所有界面,副本界面关闭mask 2021-04-22 15:24:46 +08:00
gaoxin 43afe3d6f1 【内存】btview可能会导致重复卸载资源的问题 2021-04-22 13:40:04 +08:00
zhangqiang 720e9a2d75 【日常副本】“今日剩余次数”修改为“今日剩余免费次数”——3 2021-04-22 10:20:42 +08:00
zhangqiang 9d773c0532 【日常副本优化】首次挑战副本不再消耗次数 —— 2 2021-04-21 18:14:28 +08:00
ZhangBiao 2df3ac159c 【限时活动】完成?删除loggreen 2021-04-21 16:36:12 +08:00