Commit Graph

390 Commits (83a1bc5d57a7a58e37bd9c91b8627348beaa74f8)

Author SHA1 Message Date
PC-202302260912\Administrator 785b74dbdc 框底替换 2024-12-23 19:21:47 +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 c860d62433 优化页面 2024-09-18 13:22:59 +08:00
wangzhenxing 1e1b819b78 战斗力修改 2024-07-24 16:52:03 +08:00
wangzhenxing e109d573ca 聊天修改 公会不能修改宣言 2024-07-19 10:33:54 +08:00
wangzhenxing 38f36fabbb 战斗力修改 2024-07-18 15:14:23 +08:00
PC-202302260912\Administrator 615ab6db4a 十绝阵 2024-05-30 18:18:12 +08:00
wangzhenxing 537cba2cd7 聊天公会援助修改 2024-05-22 18:07:09 +08:00
wangzhenxing 3a418ee89b 开服冲榜按钮修改 2024-03-05 17:15:42 +08:00
wangzhenxing 6789e152c3 地盘争夺修改 2024-02-22 15:37:04 +08:00
wangzhenxing a578fb63ae 天下第一界面提交 2024-02-06 18:24:11 +08:00
xiejun eb3603a85c 英雄试炼 2024-01-31 11:12:03 +08:00
wangzhenxing d870e86f74 公会成员详情界面修改 2024-01-30 15:08:38 +08:00
xiejun bf40a318b0 调整UI 2024-01-22 15:30:57 +08:00
xiejun ac384ba7fc 修改底部图标 2024-01-20 16:01:31 +08:00
wangzhenxing dccf5ec98a 屏蔽公会信息详情界面 2024-01-19 14:34:50 +08:00
wangzhenxing f12b218bdb 屏蔽公会成员详情界面 2024-01-19 14:33:25 +08:00
xiejun cd858da64f 公会试炼 2024-01-17 15:57:29 +08:00
wangzhenxing 5ad346e8e8 公会祭祀修改提交 2024-01-17 11:14:38 +08:00
wangzhenxing 27bc8f5442 生命卡排序 2024-01-16 13:56:40 +08:00
wangzhenxing 7a232cc185 生命卡修改提交 2024-01-16 11:21:17 +08:00
wangzhenxing 48f78846a3 潜能修改 2024-01-11 14:04:35 +08:00
wangzhenxing 030431e3fc 合并0.1新功能修改 2024-01-03 15:24:49 +08:00
wangzhenxing 9539c997e5 工会副本修改 2023-12-08 22:47:09 +08:00
xiejun 81a363236c 十绝阵 2023-12-08 22:42:41 +08:00
xiejun 0980772ff6 十绝阵角色立绘位置调整 2023-12-08 17:47:38 +08:00
xiejun 2844e08a9d 公会副本扫荡修复 2023-12-02 13:26:48 +08:00
xiejun 570dc1cac7 改名UI 2023-12-01 20:47:35 +08:00
PC-202302260912\Administrator 6d31ea6a3c 英雄图鉴显示法宝修改
(cherry picked from commit ebd474c54b)
2023-11-29 19:05:06 +08:00
wangzhenxing 50517e9b94 主城界面修改提交 2023-11-15 16:08:39 +08:00
xiejun d876a69a23 十绝阵BUG修复 2023-11-11 17:27:09 +08:00
xiejun 4c382362a7 十绝阵UI 2023-11-06 17:26:18 +08:00
wangzhenxing 1c65cd4052 法灵修改 2023-10-27 16:16:37 +08:00
wangzhenxing e795b4834b 法灵红点提交 2023-10-27 14:10:43 +08:00
wangzhenxing ed4865cc3c 法宝星级显示修改 2023-10-26 20:44:18 +08:00
wangzhenxing 0d08ea1a84 法灵提交 2023-10-26 17:16:10 +08:00
xiejun 965fc5d494 十绝症UI 2023-10-25 18:51:09 +08:00
xiejun 077b82bd84 好友,公会副本等UI修改 2023-10-18 20:41:04 +08:00
wangzhenxing ae5b5962b8 注释登录发送鸿蒙阵请求 2023-10-16 18:31:34 +08:00
wangzhenxing c43520367a 潜能红点提交 2023-10-16 17:11:07 +08:00
wangzhenxing a66437ec72 潜能提交 2023-10-16 15:12:47 +08:00
xiejun 83a8e9ab56 修改 2023-09-01 18:27:39 +08:00
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
xiejun f549956ebb 新预制体已经公会和活动ui 2023-08-28 11:34:43 +08:00
xiejun bbde945918 新角色立绘 2023-08-15 12:36:04 +08:00
wangzhenxing 478347bc6d 战斗============================被动441修改 2023-04-04 16:27:15 +08:00
wangzhenxing 1c60b69d1a [战斗]=======================每回合添加最大buff添加数,伤害数,治疗御甲数限制 2023-02-24 11:02:14 +08:00
wangzhenxing fd4f7908c3 车迟斗法修改 2023-01-12 18:27:23 +08:00
wangzhenxing 3782873283 公会车迟斗法修改 2023-01-12 18:20:27 +08:00
wangzhenxing 7f8dcf2416 [连冲返利]=====报错修改,名称敏感字符提示修改 2022-06-21 14:40:48 +08:00