DESKTOP-RH64908\Administrator
3e7c0cc1aa
Merge branch 'dev_oneDis' into dev_one_discount
2023-09-05 15:18:02 +08:00
wangzhenxing
db98c5dd91
Merge branch 'dev_oneDis' of http://192.168.1.21:3000/root/miduo_client into dev_oneDis
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2023-09-05 15:04:26 +08:00
PC-202302260912\Administrator
99bf06bd3b
魂印狂欢图标
2023-09-07 14:51:19 +08:00
wangzhenxing
2a5188a8fc
协议提交
2023-09-05 14:55:38 +08:00
PC-202302260912\Administrator
253858dfba
黄猿图片
2023-09-04 21:39:41 +08:00
PC-202302260912\Administrator
d2f39af497
阿龙上传
2023-09-04 20:10:53 +08:00
wangzhenxing
db3b8d9562
【战斗】====================被动添加479
2023-09-04 18:45:16 +08:00
xiejun
363b5a3818
图鉴UI
2023-09-04 18:27:40 +08:00
wangzhenxing
c889e67a43
英雄属性详情界面去除工会技能跳转
2023-09-04 16:57:01 +08:00
xiejun
731ca32f5b
修改BUG
2023-09-04 15:40:11 +08:00
xiejun
3993a248c0
修改bUG
2023-09-04 15:21:09 +08:00
PC-202302260912\Administrator
fcf92fcc50
添加动作
2023-09-04 14:51:27 +08:00
PC-202302260912\Administrator
d73b462e1d
上传美术资源
2023-09-04 14:00:24 +08:00
PC-202302260912\Administrator
4bfa80709f
修正头像
2023-09-02 19:17:32 +08:00
xiejun
87bd10593d
工会
2023-09-02 18:59:49 +08:00
xiejun
3ab79a59b7
副本UI
2023-09-02 18:53:21 +08:00
xiejun
c6d6e21e57
修改
2023-09-02 18:04:06 +08:00
xiejun
0a3533dbfe
挑战副本
2023-09-02 17:17:15 +08:00
xiejun
5b8ef487f7
御灵
2023-09-02 17:16:34 +08:00
PC-202302260912\Administrator
f4e90a59c4
新增图片
2023-09-02 16:12:34 +08:00
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