Commit Graph

429 Commits (89cc2595e1b8d77d5f7146eee0b4b4c70d53e6da)

Author SHA1 Message Date
PC-202302260912\Administrator b61118a8dd 优化页面 2024-12-23 20:14:39 +08:00
PC-202302260912\Administrator 70909e0fc6 龙珠页面修改 2024-12-23 16:21:08 +08:00
PC-202302260912\Administrator 6d9e176164 优化页面1 2024-12-02 14:11: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 61b79d39cc 竞技场排行榜页面修改 2024-10-08 13:14:18 +08:00
PC-202302260912\Administrator e8a1bf84da 推进城 改为宇宙生成挑战 2024-09-12 19:37:04 +08:00
PC-202302260912\Administrator 971ba9b2a5 替换文字 2024-09-12 19:29:03 +08:00
PC-202302260912\Administrator a3f36c4cf8 霸气修改为界神技 2024-09-12 18:55:11 +08:00
PC-202302260912\Administrator 0b3cb6df94 生命卡修改为意念 预设修改 2024-09-12 18:34:47 +08:00
PC-202302260912\Administrator 78e2e6a8da 圣器改为神龙 2024-09-09 18:03:32 +08:00
PC-202302260912\Administrator ea984a0c44 七界页面修改 2024-06-29 17:28:51 +08:00
wangzhenxing 6f40daa7e6 心愿抽卡修改 2024-05-24 15:14:47 +08:00
wangzhenxing 0adf247902 限时招募抽卡详情文字颜色修改 2024-05-24 14:29:34 +08:00
xiejun 795beb3e59 no message 2024-05-20 19:35:38 +08:00
wangzhenxing 8a343c63c2 四海历练助战修改 2024-02-29 18:19:57 +08:00
PC-202302260912\Administrator 61b4051868 竞技场段位修改 2024-02-26 14:44:57 +08:00
wangzhenxing e65fdcf151 竞技场修改 2024-02-21 18:21:38 +08:00
wangzhenxing 7d5d0d179e 排行榜奖励显示修改 2024-02-21 14:57:09 +08:00
wangzhenxing 03f001fc03 段位排名修改 2024-02-20 19:23:48 +08:00
wangzhenxing f17b1f767a 段位排行修改 2024-02-20 19:08:01 +08:00
wangzhenxing 29c2f73906 竞技场修改 2024-02-20 17:56:23 +08:00
wangzhenxing 9c8e4d153e 竞技场红点修改提交 2024-02-07 14:27:20 +08:00
wangzhenxing b743ccd296 新竞技场修改 2024-02-06 15:09:42 +08:00
wangzhenxing 76cd9f8354 新竞技场提交 2024-02-05 19:00:08 +08:00
wangzhenxing c0e1b14b3a 竞技场界面预设修改 2024-01-29 18:35:08 +08:00
wangzhenxing 6a053ea36f 副本排行榜描述修改 2024-01-20 20:26:09 +08:00
wangzhenxing f2c3cfa8bf 图鉴预设修改提交 2024-01-20 14:21:47 +08:00
wangzhenxing 3a7f3fb6ba 灵兽名称修改 2024-01-18 21:27:53 +08:00
xiejun 0e92876818 七界试炼bug修复 2024-01-18 20:10:44 +08:00
wangzhenxing d0232e9a98 变身卡描述修改 2024-01-15 15:26:42 +08:00
wangzhenxing 030431e3fc 合并0.1新功能修改 2024-01-03 15:24:49 +08:00
wangzhenxing ff42f1ad59 神印修改提交 2024-01-02 16:58:06 +08:00
wangzhenxing d956e6050a 羁绊功能修改 2024-01-02 10:54:50 +08:00
wangzhenxing 63e9a01c73 法宝改成生命卡 2023-12-08 21:57:53 +08:00
wangzhenxing c3334a5d98 更换名称 2023-12-07 01:11:27 +08:00
wangzhenxing e4299072f4 名称替换 2023-12-07 00:09:44 +08:00
wangzhenxing 6e981aa05d 战斗技能名称显示修改 2023-12-04 14:22:53 +08:00
wangzhenxing 04fc9b9f3e 山河社稷图突破修改提交 2023-12-04 10:52:10 +08:00
wangzhenxing 9c1823a57b 装备抽卡修改提交 2023-10-27 20:58:24 +08:00
xiejun 663fbca133 神兵热榜 2023-10-24 20:02:38 +08:00
xiejun af6b341a0c 修改子弹逻辑 2023-09-18 15:41:32 +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 148443883c 神将 2023-08-11 19:03:48 +08:00
wangzhenxing 14e16c3d34 心愿法宝弹窗修改 2023-06-06 16:50:56 +08:00
wangzhenxing ebfddaad60 法宝心愿修改提交 2023-06-06 15:57:53 +08:00
wangzhenxing ac172339ae 心愿抽卡修改提交 2023-05-27 19:04:30 +08:00
wangzhenxing ba747f657a 神印升品空白修改 2023-01-24 20:29:23 +08:00
wangzhenxing 7109e86706 英雄热榜提交 2022-12-13 16:06:12 +08:00
wangzhenxing 8ecb6ee081 七界特权描述修改 2022-11-07 15:06:33 +08:00
wangzhenxing 19ce8e51d5 英雄升星扩展 2022-11-03 14:33:09 +08:00