xiejun
|
6ced2b0507
|
Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
# AssetBundles/version.txt
# Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
# Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
|
2023-08-29 17:58:24 +08:00 |
wangzhenxing
|
cda1bc9893
|
灵脉秘境置灰能进入问题修改
|
2023-07-31 17:56:30 +08:00 |
PC-202302260912\Administrator
|
4a15931ce1
|
【七界试炼】======入口提示修改
|
2023-07-07 15:51:59 +08:00 |
PC-202302260912\Administrator
|
5838089889
|
七界试炼,灵脉秘境更换入口,日常任务副本只保留前两个
(cherry picked from commit 0646849c2f)
|
2023-06-28 15:50:22 +08:00 |
wangzhenxing
|
09ea7051f0
|
屏蔽大闹天宫,森罗幻境
|
2023-05-30 10:26:42 +08:00 |
wangzhenxing
|
04a84da290
|
多队塔红点提交
|
2023-03-22 14:58:19 +08:00 |
wangzhenxing
|
91b1bbb82c
|
遴选多队塔代码
|
2023-03-21 10:58:00 +08:00 |
wangzhenxing
|
6d55ae95d7
|
Revert "多队塔提交"
This reverts commit 4a411833a5.
|
2023-03-20 11:42:40 +08:00 |
wangzhenxing
|
4a411833a5
|
多队塔提交
|
2023-03-20 11:22:44 +08:00 |
wangzhenxing
|
d38eac6169
|
轩辕宝镜屏蔽 排行榜 奖励 按钮
|
2023-01-10 15:38:13 +08:00 |
yuanshuai
|
a25e17fa7f
|
轩辕宝镜挑战次数bug修改
|
2022-12-27 18:24:45 +08:00 |
yuanshuai
|
2429aa88fc
|
挑战副本优化
|
2022-12-23 13:28:25 +08:00 |
yuanshuai
|
99a65d573a
|
挑战副本界面修改
|
2022-12-21 10:46:20 +08:00 |
wangzhenxing
|
e840b0d42a
|
日常副本修改提交
|
2022-12-08 17:00:29 +08:00 |
wangzhenxing
|
611af0d444
|
日常副本修改提交
|
2022-12-05 14:45:59 +08:00 |
yuanshuai
|
cb636ad718
|
挑战副本结算修改
|
2022-12-02 15:55:32 +08:00 |
yuanshuai
|
8023aa69f0
|
挑战副本奖励显示修改
|
2022-12-02 11:47:07 +08:00 |
yuanshuai
|
5fc4f301c4
|
挑战副本修改
|
2022-11-14 11:19:18 +08:00 |
wangzhenxing
|
8badc5fcda
|
山河设计图第一次打开修改
|
2022-11-11 15:33:43 +08:00 |
wangzhenxing
|
ac078416dd
|
[gm]======转盘提交
|
2022-10-27 15:32:13 +08:00 |
wangzhenxing
|
f3d4eed21c
|
[gm]=======名望特权修改
|
2022-10-25 10:23:48 +08:00 |
yuanshuai
|
e9c2c5ffdc
|
挑战副本时间隐藏
|
2022-04-27 18:15:29 +08:00 |
yuanshuai
|
868eb69aa6
|
挑战副本bug修改
|
2022-04-25 19:33:11 +08:00 |
yuanshuai
|
fd6f30e459
|
挑战副本bug修改
|
2022-04-25 18:56:48 +08:00 |
wangzhenxing
|
aad7541dbd
|
挑战副本不显示倒计时
|
2022-04-24 21:31:49 +08:00 |
yuanshuai
|
bf52645eb7
|
挑战副本优化
|
2022-04-25 18:20:53 +08:00 |
yuanshuai
|
50683260c7
|
挑战副本红点提交
|
2022-04-20 13:23:08 +08:00 |
yuanshuai
|
804b2c3f4d
|
挑战副本bug修改
|
2022-04-19 16:50:03 +08:00 |
yuanshuai
|
24bf6c63e4
|
挑战副本脚本修改
|
2022-04-19 15:52:50 +08:00 |
yuanshuai
|
b907383826
|
挑战副本脚本修改
|
2022-04-19 11:53:08 +08:00 |
yuanshuai
|
b4a626d9e2
|
挑战副本脚本修改提交
|
2022-04-18 18:48:06 +08:00 |
yuanshuai
|
f8f14d06e9
|
挑战副本修改
|
2022-04-18 00:03:41 +08:00 |
yuanshuai
|
bd3bed7e41
|
挑战副本脚本提交
|
2022-04-15 11:48:52 +08:00 |
yuanshuai
|
9ebdab46b3
|
挑战副本相关脚本提交
|
2022-04-14 16:07:45 +08:00 |
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 |