DESKTOP-RH64908\Administrator
|
7091859e31
|
Merge branch 'dev_oneDis' into dev_one_discount
|
2023-09-02 12:30:18 +08:00 |
wangzhenxing
|
241fda7f84
|
命石修改提交
|
2023-09-02 12:28:14 +08:00 |
DESKTOP-RH64908\Administrator
|
adf50916c0
|
Merge branch 'dev_oneDis' into dev_one_discount
|
2023-09-01 23:43:48 +08:00 |
wangzhenxing
|
c39a4e1fcc
|
命石修改提交
|
2023-09-01 23:41:45 +08:00 |
xiejun
|
1a34fec66e
|
修复bug
|
2023-09-01 20:18:46 +08:00 |
DESKTOP-RH64908\Administrator
|
0269e6bd94
|
Merge branch 'dev_oneDis' into dev_one_discount
|
2023-09-01 19:37:32 +08:00 |
wangzhenxing
|
f792ab4c7d
|
命石修改
|
2023-09-01 19:35:49 +08:00 |
wangzhenxing
|
1318c74f59
|
红点修改提交
|
2023-09-01 19:26:54 +08:00 |
PC-202302260912\Administrator
|
83eea07584
|
牛气冲天图片修正
|
2023-09-04 19:03:24 +08:00 |
wangzhenxing
|
c9418f9821
|
命石奖励预设修改
|
2023-09-01 19:01:33 +08:00 |
wangzhenxing
|
3ac8d1ee2c
|
魂印图鉴修改提交
|
2023-09-01 18:48:59 +08:00 |
wangzhenxing
|
ffaab0f625
|
命石飘战力提交
|
2023-09-01 18:29:25 +08:00 |
xiejun
|
83a8e9ab56
|
修改
|
2023-09-01 18:27:39 +08:00 |
wangzhenxing
|
55f0c6d3e6
|
魂印图鉴修改 ,命石修改
|
2023-09-01 18:04:52 +08:00 |
wangzhenxing
|
2b93776f7c
|
命格修改提交
|
2023-09-01 17:36:15 +08:00 |
wangzhenxing
|
0e083205a3
|
命格修改提交
|
2023-09-01 12:34:34 +08:00 |
PC-202302260912\Administrator
|
24933b853c
|
修改头像
|
2023-08-31 21:51:08 +08:00 |
wangzhenxing
|
18e10b4fb6
|
命格修改提交
|
2023-08-31 19:12:02 +08:00 |
wangzhenxing
|
5e1cc83b2a
|
命石修改提交
|
2023-08-31 15:20:27 +08:00 |
wangzhenxing
|
52393c592c
|
命石提交
|
2023-08-31 15:02:13 +08:00 |
wangzhenxing
|
e0cd811e75
|
百抽活动去掉时间显示
|
2023-08-31 10:31:27 +08:00 |
xiejun
|
837e769c14
|
七界
|
2023-08-30 22:07:43 +08:00 |
xiejun
|
e50aa15b47
|
修改代码
|
2023-08-30 21:33:02 +08:00 |
xiejun
|
f42141a40e
|
修改灵兽代码
|
2023-08-30 21:31:29 +08:00 |
xiejun
|
87c1193f8b
|
修改BUG
|
2023-08-30 21:25:36 +08:00 |
xiejun
|
f1b9b526c1
|
代码修改
|
2023-08-30 20:33:29 +08:00 |
PC-202302260912\Administrator
|
bb967fb2b6
|
香克斯图片替换
|
2023-08-30 11:06:03 +08:00 |
PC-202302260912\Administrator
|
e2ca24353a
|
布鲁克图片
|
2023-08-30 10:47:43 +08:00 |
wangzhenxing
|
0dddc2ef7c
|
轩辕宝镜修改
(cherry picked from commit f838e2d0f2 )
|
2023-08-30 10:35:11 +08:00 |
xiejun
|
96efe07502
|
prefab布鲁克
|
2023-08-29 19:18:35 +08:00 |
wangzhenxing
|
f9774fd187
|
百抽活动修改提交,最多只显示七天奖励
|
2023-08-29 18:58:09 +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 |
wangzhenxing
|
f838e2d0f2
|
轩辕宝镜修改
|
2023-08-29 15:21:53 +08:00 |
PC-202302260912\Administrator
|
a68e4b9326
|
上传图片
|
2023-08-29 14:52:10 +08:00 |
xiejun
|
4d8b08104c
|
七界资源
|
2023-08-28 18:52:15 +08:00 |
wangzhenxing
|
4ade868f90
|
抽卡去掉妖精限制提示
|
2023-08-28 14:04:41 +08:00 |
xiejun
|
f549956ebb
|
新预制体已经公会和活动ui
|
2023-08-28 11:34:43 +08:00 |
wangzhenxing
|
595487091b
|
【战斗】=======battlelogic修改
|
2023-08-25 18:58:32 +08:00 |
wangzhenxing
|
47edf3b630
|
【战斗】==================被动477 478修改
|
2023-08-25 18:32:56 +08:00 |
wangzhenxing
|
0d6566c725
|
【战斗】============被动472修改
|
2023-08-25 17:14:55 +08:00 |
wangzhenxing
|
d9778dbae4
|
【战斗】=================被动修改提交
|
2023-08-25 16:03:57 +08:00 |
wangzhenxing
|
91c292a809
|
[战斗]================被动475修改
|
2023-08-25 11:49:56 +08:00 |
wangzhenxing
|
4cbe612e03
|
新英雄 buff图标提示提交
|
2023-08-24 18:21:09 +08:00 |
wangzhenxing
|
d28ca0a5fb
|
【战斗】===============新英雄被动修改
|
2023-08-24 18:20:04 +08:00 |
wangzhenxing
|
461029ab50
|
[战斗]=================战斗battleutil 修改
|
2023-08-24 14:48:59 +08:00 |
wangzhenxing
|
4205ce3afc
|
[战斗]==============被动474修改
|
2023-08-24 10:27:30 +08:00 |
wangzhenxing
|
178ba22181
|
[战斗]======================时空女儿国王 新英雄提交
|
2023-08-23 16:33:16 +08:00 |
wangzhenxing
|
3037378c42
|
神将热榜, 图鉴预设修改提交
|
2023-08-23 16:04:46 +08:00 |
wangzhenxing
|
07ffec7f1f
|
【合服】=============登录协议添加serverid
|
2023-08-22 13:59:39 +08:00 |
xiejun
|
9d3234a34b
|
修改BUG
|
2023-08-18 21:40:29 +08:00 |