PC-202302260912\Administrator
|
19c908f543
|
页面再次优化
|
2024-10-30 17:57:16 +08:00 |
zhangjiannan
|
19484d6b62
|
Merge remote-tracking branch 'remotes/origin/onepiece_bt' into TCX_LongZhu
# Conflicts:
# Assets/ManagedResources/Icon/Haizeiskill.meta
# Assets/ManagedResources/Icons/luofu_huobi_1.png
# Assets/ManagedResources/Icons/luofu_huobi_1.png.meta
# Assets/ManagedResources/Icons/luofu_huobi_2.png
# Assets/ManagedResources/Icons/luofu_huobi_2.png.meta
# Assets/ManagedResources/Icons/luofu_huobi_3.png
# Assets/ManagedResources/Icons/luofu_huobi_3.png.meta
# Assets/ManagedResources/Icons/luofu_huobi_4.png
# Assets/ManagedResources/Icons/luofu_huobi_4.png.meta
# Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
# Assets/ManagedResources/Prefabs/UI/GMPanel/GMShuaChongTeQuan.prefab
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab
# Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGiftNew.prefab
# Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Ranking/RankingListMainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Recruit/RecruitMainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/UppperMonthCardView/UppperMonthCard.prefab
# Assets/ManagedResources/Prefabs/UI/XunBaoMiZong/XunBaoMiZongPanel.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Language.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
|
2024-10-11 16:36:50 +08:00 |
PC-202302260912\Administrator
|
971ba9b2a5
|
替换文字
|
2024-09-12 19:29:03 +08:00 |
wangzhenxing
|
0d5d64dd04
|
罗浮争锋修改提交==================
|
2024-06-18 14:27:45 +08:00 |
PC-202302260912\Administrator
|
0cfc87192e
|
优化页面
|
2024-03-07 17:09:44 +08:00 |
xiejun
|
698dad8d89
|
预制体修改
|
2024-02-02 18:27:37 +08:00 |
wangzhenxing
|
06a1b0ea97
|
四海试炼上阵界面修改
|
2024-01-15 19:11:29 +08:00 |
wangzhenxing
|
e4299072f4
|
名称替换
|
2023-12-07 00:09:44 +08:00 |
wangzhenxing
|
966755fd6a
|
备战界面修改提交
|
2023-12-06 19:40:45 +08:00 |
xiejun
|
3aba3f4bee
|
伟大航路UI
|
2023-12-06 18:59:38 +08:00 |
wangzhenxing
|
bc2603a3f2
|
备战界面设置界面修改
|
2023-11-13 15:34:29 +08:00 |
wangzhenxing
|
793daedcb4
|
英雄列表阵容显示修改
|
2023-11-06 14:55:59 +08:00 |
xiejun
|
83a8e9ab56
|
修改
|
2023-09-01 18:27:39 +08:00 |
xiejun
|
f549956ebb
|
新预制体已经公会和活动ui
|
2023-08-28 11:34:43 +08:00 |
wangzhenxing
|
42aeb38e6f
|
多队塔编对修改提交
|
2023-04-20 13:13:22 +08:00 |
wangzhenxing
|
a1c038b5c0
|
新英雄宝物修改提交
|
2023-04-19 13:49:21 +08:00 |
wangzhenxing
|
5999c18900
|
新英雄上阵修改提交
|
2023-04-18 15:34:22 +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
|
b3b95119c0
|
备战界面星级显示修改
|
2023-01-12 16:47:04 +08:00 |
wangzhenxing
|
4ca7445e8b
|
跳过战斗修改
|
2023-01-04 18:16:08 +08:00 |
wangzhenxing
|
7a66818c2e
|
备战界面星级显示修改
|
2022-12-22 14:21:59 +08:00 |
wangzhenxing
|
a6bd546897
|
玉虚轮道备战星级修改
|
2022-12-20 15:07:17 +08:00 |
wangzhenxing
|
bef029e5ca
|
战斗跳过添加开启条件
|
2022-12-12 15:43:33 +08:00 |
wangzhenxing
|
2d35f6f270
|
[bt]======添加战斗跳过
|
2022-12-07 11:41:20 +08:00 |
wangzhenxing
|
c5921ae680
|
[玉虚论道]=====编队英雄详情修改提交
|
2022-09-02 13:58:13 +08:00 |
wangzhenxing
|
bdc2cd7ef9
|
[玉虚论道]=====玉虚论道修改
|
2022-09-01 18:15:08 +08:00 |
wangzhenxing
|
e3b1b3a967
|
[玉虚论道]=====星级,等级显示修改
|
2022-09-01 17:05:24 +08:00 |
yuanshuai
|
b4a626d9e2
|
挑战副本脚本修改提交
|
2022-04-18 18:48:06 +08:00 |
wangzhenxing
|
2ed317bc2c
|
摘星阁修改,备战阵营图标显示修改
|
2022-04-07 15:09:04 +08:00 |
wangzhenxing
|
0a52e4a549
|
[bug]=====神系英雄修改提交
|
2022-04-02 16:03:18 +08:00 |
wangzhenxing
|
a3e166a05e
|
【bug】=====英雄列表排序修改
|
2022-03-31 18:11:08 +08:00 |
wangzhenxing
|
a13dd2939a
|
[功能]================神系英雄添加提叫
|
2022-03-28 18:18:19 +08:00 |
jiaoyangna
|
5348a49256
|
Revert "冲突提交"
This reverts commit b5a29c9152 .
|
2022-03-22 11:06:54 +08:00 |
jiaoyangna
|
c93b9e3f04
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-03-21 18:29:21 +08:00 |
jiaoyangna
|
b5a29c9152
|
冲突提交
|
2022-03-21 18:29:03 +08:00 |
wangzhenxing
|
4562629709
|
[功能]==============修行技能添加战斗力提交
|
2022-03-21 17:46:30 +08:00 |
wangzhenxing
|
b18db8765d
|
[飞升]=====飞升特效修改提交
|
2022-01-21 17:09:14 +08:00 |
wangzhenxing
|
7de5fdac9e
|
[飞升]=====特效问题修改
|
2022-01-20 17:58:57 +08:00 |
wangzhenxing
|
6ef00a4498
|
[飞升]=====细节调整
|
2022-01-19 16:57:17 +08:00 |
wangzhenxing
|
4034a90a33
|
[飞升]======优化修改提交
|
2022-01-19 15:29:47 +08:00 |
wangzhenxing
|
1de7293630
|
[飞升]======卡牌飞升预设修改
|
2022-01-17 16:53:26 +08:00 |
wangzhenxing
|
ef0a0ff436
|
Merge branch 'china/dev' into china/飞升
Conflicts:
Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab
Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
Assets/ManagedResources/~Lua/Data/UIData.lua
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua
Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
|
2022-01-15 12:47:22 +08:00 |
wangzhenxing
|
ff7b7ba5ed
|
[飞升]=====bug修改提交
|
2022-01-12 16:41:51 +08:00 |
wangzhenxing
|
1b39fbdbe9
|
【飞升】===========神魂后星级显示修改
|
2022-01-10 15:11:30 +08:00 |
gaoxin
|
34e90db4fd
|
【编队删选】添加职业筛选效果,高亮效果颜色修改
|
2022-01-07 16:40:31 +08:00 |
wangzhenxing
|
e5c176cd9f
|
[飞升]============特效显示修改提交
|
2022-01-07 10:08:55 +08:00 |
jiaoyangna
|
b1be355601
|
Merge branch 'tansuo' into china/dev
# Conflicts:
# Assets/ManagedResources/Atlas/ExploreAtlas.meta
# Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2022-01-06 16:07:59 +08:00 |
wangzhenxing
|
5b670023ed
|
[飞升]=======飞升代码逻辑提交
|
2022-01-05 18:17:44 +08:00 |