Commit Graph

733 Commits (e374db3a5a1a416d5469b83be8feed3d2929112f)

Author SHA1 Message Date
wangzhenxing 4c362159ed 神兵获取显示详情 2024-01-16 18:24:49 +08:00
wangzhenxing 9dcd29e6a3 法相详情修改提交 2024-01-16 16:47:24 +08:00
wangzhenxing 4ce04b9c0f 助战英雄显示修改提交 2024-01-13 17:49:46 +08:00
wangzhenxing fe86bacd77 [礼物]======礼物升星提交 2024-01-10 18:12:31 +08:00
xiejun 9f8a65e453 核心标记 2024-01-05 18:14:42 +08:00
wangzhenxing 1d584c8d68 Merge branch 'onepiece_demo' into onepiece_demo_dev 2024-01-04 11:27:30 +08:00
wangzhenxing 5fcd2ada66 主城主角名字 称号位置修改 2024-01-03 19:26:17 +08:00
wangzhenxing 030431e3fc 合并0.1新功能修改 2024-01-03 15:24:49 +08:00
wangzhenxing ff42f1ad59 神印修改提交 2024-01-02 16:58:06 +08:00
xiejun 0ccaffd591 四海历练 2023-12-28 16:44:58 +08:00
xiejun 4f8f3955ce 关卡动态页面和巅峰赛竞技场 2023-12-22 15:36:03 +08:00
xiejun 65139fbbe0 商店UI喝间距修改 2023-12-07 20:22:37 +08:00
wangzhenxing c3334a5d98 更换名称 2023-12-07 01:11:27 +08:00
wangzhenxing e4299072f4 名称替换 2023-12-07 00:09:44 +08:00
xiejun 3aba3f4bee 伟大航路UI 2023-12-06 18:59:38 +08:00
xiejun dcb7770e8d 神兵UI修改 2023-12-06 15:49:03 +08:00
xiejun 99ac349d8c 修改角色界面ui 2023-12-05 18:16:33 +08:00
wangzhenxing 9ee7c9793f 灵兽界面修改 2023-11-11 15:42:30 +08:00
xiejun 7cdff99432 商店UI修改 2023-11-10 17:47:26 +08:00
wangzhenxing d38fdf9717 首充预设修改提交 2023-11-10 15:35:12 +08:00
wangzhenxing 44f6ea0e86 抽取命石添加次数限制 2023-10-28 15:41:17 +08:00
wangzhenxing 9c1823a57b 装备抽卡修改提交 2023-10-27 20:58:24 +08:00
wangzhenxing b31c93e68b 装备神应显示修改 2023-10-27 16:22:27 +08:00
wangzhenxing 2134fa658d 法宝添加开启条件,抽卡显示修改 2023-10-27 10:57:03 +08:00
xiejun 44087689d4 灵兽 2023-10-08 16:53:34 +08:00
wangzhenxing bb18772265 Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2023-09-21 18:43:54 +08:00
xiejun b6bf5409f1 修改合并后的bug 2023-09-21 17:04:24 +08:00
wangzhenxing 76c7acf061 礼物item显示修改 2023-09-21 15:36:17 +08:00
wangzhenxing 083305249a 银条添加加号 2023-09-20 19:02:41 +08:00
xiejun c47462c5d8 Merge branch 'dev_one_discount' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
# Conflicts:
#	AssetBundles/version.txt
#	Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
#	Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelChapterPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
2023-09-20 18:57:44 +08:00
xiejun 88740201b3 排行榜UI 2023-09-20 18:00:40 +08:00
wangzhenxing ff5bcbced9 礼物合成显示秀嘎,添加礼物商店跳转 2023-09-20 17:40:33 +08:00
wangzhenxing 5f6d51786d 礼物显示修改 2023-09-20 15:41:36 +08:00
wangzhenxing 14ce1fedbd 时空神将推荐阵容显示修改提交
(cherry picked from commit 883f9af02e)
2023-09-15 14:18:47 +08:00
wangzhenxing 883f9af02e 时空神将推荐阵容显示修改提交 2023-09-14 16:21:33 +08:00
wangzhenxing 6085b2193a 多对塔挑战修改 2023-09-06 14:43:33 +08:00
wangzhenxing 3ac8d1ee2c 魂印图鉴修改提交 2023-09-01 18:48:59 +08:00
wangzhenxing 2b93776f7c 命格修改提交 2023-09-01 17:36:15 +08:00
wangzhenxing 52393c592c 命石提交 2023-08-31 15:02:13 +08:00
xiejun f1b9b526c1 代码修改 2023-08-30 20:33:29 +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 4d8b08104c 七界资源 2023-08-28 18:52:15 +08:00
xiejun 734cb92be9 去掉pating和spriteloader相关的代码 2023-08-16 11:55:55 +08:00
wangzhenxing 201d64e5b3 置换玉去除加号 2023-08-08 15:45:59 +08:00
PC-202302260912\Administrator 2cb20e9bba 英雄获取途径显示修改 2023-07-19 14:35:52 +08:00
xiejun fd59086676 主界面UI替换 2023-06-30 00:13:43 +08:00
xiejun b47c16dcb7 test 2023-06-20 18:01:51 +08:00
wangzhenxing a0fa68be2a 登陆界面去掉儿童协议,主角信息去掉特权等级按钮 2023-05-26 18:43:52 +08:00
wangzhenxing 3bdc14d9a3 法相等级星级显示修改 2023-04-19 10:57:48 +08:00
wangzhenxing bd567ad367 神兵icon显示修改 2023-04-13 14:29:49 +08:00