PC-202302260912\Administrator
|
99bf06bd3b
|
魂印狂欢图标
|
2023-09-07 14:51:19 +08:00 |
wangzhenxing
|
52393c592c
|
命石提交
|
2023-08-31 15:02:13 +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 |
wangzhenxing
|
4cbe612e03
|
新英雄 buff图标提示提交
|
2023-08-24 18:21:09 +08:00 |
xiejun
|
148443883c
|
神将
|
2023-08-11 19:03:48 +08:00 |
PC-202302260912\Administrator
|
d0c184cc42
|
狂欢图标修改
|
2023-08-02 17:09:16 +08:00 |
wangzhenxing
|
073d87eda7
|
妖精累充banner图替换修改
|
2023-08-01 16:31:26 +08:00 |
xiejun
|
fd8329bf90
|
海贼UI
|
2023-07-27 18:37:04 +08:00 |
xiejun
|
8a4e15e258
|
海贼UI替换
|
2023-07-21 17:04:16 +08:00 |
PC-202302260912\Administrator
|
4e949b17b0
|
日常副本入口文字图片修改提交
|
2023-07-17 17:50:16 +08:00 |
PC-202302260912\Administrator
|
addd9312da
|
玲珑商店图片资源提交
|
2023-07-14 14:29:52 +08:00 |
PC-202302260912\Administrator
|
08e1057cf6
|
月卡基金50倍图片修改提交
|
2023-07-14 13:58:47 +08:00 |
xiejun
|
fd59086676
|
主界面UI替换
|
2023-06-30 00:13:43 +08:00 |
PC-202302260912\Administrator
|
146c855499
|
超值基金按钮
|
2023-06-25 17:01:04 +08:00 |
PC-202302260912\Administrator
|
8419048c88
|
日常副本图片修改提交
|
2023-07-12 17:41:04 +08:00 |
PC-202302260912\Administrator
|
5838089889
|
七界试炼,灵脉秘境更换入口,日常任务副本只保留前两个
(cherry picked from commit 0646849c2f )
|
2023-06-28 15:50:22 +08:00 |
PC-202302260912\Administrator
|
f97eb65108
|
召唤图标替换
|
2023-07-04 16:11:56 +08:00 |
xiejun
|
b47c16dcb7
|
test
|
2023-06-20 18:01:51 +08:00 |
lihaiyang
|
0fe2f64c97
|
修改美术图标
|
2023-06-06 16:14:20 +08:00 |
lihaiyang
|
3e2ef02fca
|
GM特权修改为永久特权
|
2023-06-02 15:48:05 +08:00 |
lihaiyang
|
f0ce97f220
|
修正月卡和特种特权的图
|
2023-06-02 13:54:03 +08:00 |
lihaiyang
|
f595ebee5b
|
修改称号等美术图标
|
2023-06-02 13:18:06 +08:00 |
lihaiyang
|
bc18297d46
|
十万真充改为1万红包
|
2023-06-02 10:05:33 +08:00 |
lihaiyang
|
6d33b61b56
|
修正
|
2023-06-01 11:49:05 +08:00 |
lihaiyang
|
138259e82e
|
嘲讽相关
|
2023-05-16 17:21:58 +08:00 |
lihaiyang
|
5f67dbc3fd
|
【战意】相关图标
|
2023-04-17 17:44:41 +08:00 |
wangzhenxing
|
5cd902e5a6
|
英雄时空标签修改提交
|
2023-04-14 13:54:57 +08:00 |
yuanshuai
|
ac104c73ca
|
预设修改
|
2023-04-07 14:32:34 +08:00 |
lihaiyang
|
e615c5d7ce
|
添加神兵buff
|
2023-04-07 14:16:52 +08:00 |
lihaiyang
|
d6c082583a
|
商店图标
|
2023-04-04 18:42:30 +08:00 |
wangzhenxing
|
207c1f3426
|
神兵信息弹窗修改提交
|
2023-03-29 17:21:33 +08:00 |
wangzhenxing
|
826f58ce6e
|
神兵提交
|
2023-03-28 13:57:59 +08:00 |
lihaiyang
|
0eaa10d4d3
|
多队塔界面修改
|
2023-03-21 16:02:24 +08:00 |
wangzhenxing
|
91b1bbb82c
|
遴选多队塔代码
|
2023-03-21 10:58:00 +08:00 |
wangzhenxing
|
82ba7d45c4
|
Merge branch 'china/dev_bt' into china/dev_bt_develop
Conflicts:
Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayOtherTeamPanel.prefab
Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTreasurePanel.prefab
Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua
Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/GodsWayTreasurePanel.lua
Assets/ManagedResources/~Lua/Modules/WorldArena/GodsWayOtherTeamPanel.lua
Assets/ManagedResources/~Lua/View/GodsWaySingleSingleWave.lua
|
2023-03-21 10:39:18 +08:00 |
wangzhenxing
|
6f9af97445
|
多队塔提交
|
2023-03-21 10:11:06 +08:00 |
wangzhenxing
|
6d55ae95d7
|
Revert "多队塔提交"
This reverts commit 4a411833a5 .
|
2023-03-20 11:42:40 +08:00 |
wangzhenxing
|
cea97b3605
|
Merge branch 'china/dev_bt' into china/dev_bt_develop
Conflicts:
Assets/ManagedResources/Atlas/CarbonNewAtlas/ArtFont/f_fuben_fubenming_08.png.meta
|
2023-03-20 11:39:20 +08:00 |
wangzhenxing
|
d1e4786ef7
|
副本入口文字提交
|
2023-03-20 11:36:38 +08:00 |
wangzhenxing
|
4a411833a5
|
多队塔提交
|
2023-03-20 11:22:44 +08:00 |
wangzhenxing
|
f8d5e6fcff
|
多队塔图片提交
|
2023-03-07 14:21:50 +08:00 |
lihaiyang
|
bf13859e52
|
添加压制方面的图标
|
2023-03-03 15:18:03 +08:00 |
lihaiyang
|
4c0a6c1b1b
|
金刚印相关
|
2023-02-17 14:10:07 +08:00 |
yuanshuai
|
d13e485b05
|
神将置换功能提交
|
2023-02-16 18:11:55 +08:00 |
wangzhenxing
|
d6baa6f578
|
魂印图鉴去掉天书密卷限制
|
2023-02-14 18:05:59 +08:00 |
lihaiyang
|
0b4b59e542
|
称号=====永结同心
|
2023-02-13 16:40:15 +08:00 |
wangzhenxing
|
32dc05ef86
|
易经宝库图片修改
|
2023-01-17 15:59:02 +08:00 |
wangzhenxing
|
c31676ff43
|
每日豪礼图片修改提交
|
2023-01-16 17:24:44 +08:00 |
wangzhenxing
|
da5316e20b
|
名望特权显示修改
|
2022-12-23 16:19:47 +08:00 |
yuanshuai
|
99a65d573a
|
挑战副本界面修改
|
2022-12-21 10:46:20 +08:00 |
yuanshuai
|
3371b86e57
|
妖晶和仙晶累充活动提交
|
2022-12-19 13:38:36 +08:00 |
wangzhenxing
|
0607e5179c
|
图片替换
|
2022-12-16 17:25:05 +08:00 |
lihaiyang
|
a7a7c3eb42
|
【10万真充】===修改图标
|
2022-12-20 18:16:27 +08:00 |
wangzhenxing
|
7109e86706
|
英雄热榜提交
|
2022-12-13 16:06:12 +08:00 |
wangzhenxing
|
4680624d43
|
日常副本预设修改
|
2022-12-06 13:44:29 +08:00 |
wangzhenxing
|
611af0d444
|
日常副本修改提交
|
2022-12-05 14:45:59 +08:00 |
yuanshuai
|
0dad2fdb77
|
超值基金资源修改
|
2022-12-02 17:45:01 +08:00 |
wangzhenxing
|
214b316ac9
|
[bt]========主城鸿蒙镇修改提交
|
2022-12-01 14:24:05 +08:00 |
yuanshuai
|
ba07730c30
|
Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt
|
2022-11-29 17:44:37 +08:00 |
yuanshuai
|
61e5646c05
|
资源修改
|
2022-11-29 17:44:23 +08:00 |
wangzhenxing
|
032ef3d34d
|
[bt]======充值修改
|
2022-11-29 17:42:48 +08:00 |
yuanshuai
|
1ebe336d52
|
阵容推荐修改
|
2022-11-29 17:11:21 +08:00 |
wangzhenxing
|
5c49a471da
|
[gm]====送10万充提交
|
2022-11-28 18:40:45 +08:00 |
yuanshuai
|
5005e8da5f
|
挂机战斗修改
|
2022-11-24 18:28:48 +08:00 |
wangzhenxing
|
dce08e4ce8
|
仙充券图标提交
|
2022-11-23 15:50:09 +08:00 |
wangzhenxing
|
86bfbe1496
|
刷冲特权预设修改
|
2022-11-23 15:45:31 +08:00 |
yuanshuai
|
41d594edbc
|
挑战副本修改优化
|
2022-11-17 10:48:24 +08:00 |
lihaiyang
|
f3935cc3ca
|
【转盘】=======修改名字
|
2022-11-02 17:29:45 +08:00 |
wangzhenxing
|
8d26aa7456
|
月卡图标修改
|
2022-11-16 15:40:29 +08:00 |
wangzhenxing
|
f285d5e797
|
寻仙招募图标修改提交
|
2022-11-16 14:06:55 +08:00 |
lihaiyang
|
a6929bab54
|
【防御挑战】======防御挑战图标上传
|
2022-11-14 17:46:04 +08:00 |
wangzhenxing
|
3b88556b82
|
gm按钮修改
|
2022-11-10 11:09:10 +08:00 |
wangzhenxing
|
119c186c34
|
[主城]=======按钮修改提交
|
2022-11-08 14:51:51 +08:00 |
lihaiyang
|
95de278038
|
【图标更换】==探索特权更改为太初
|
2022-11-02 14:27:47 +08:00 |
lihaiyang
|
2c3da19544
|
【豪华补给】=======修正图标
|
2022-11-03 07:06:40 +08:00 |
lihaiyang
|
9cdf8e9861
|
召唤图标
|
2022-11-02 16:28:41 +08:00 |
wangzhenxing
|
6c8c6182ad
|
特权商城入口图标修改
|
2022-11-02 13:44:46 +08:00 |
wangzhenxing
|
eacc6ef2f5
|
Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt
|
2022-10-31 18:14:35 +08:00 |
wangzhenxing
|
1e62991c2c
|
[gm]=====开服冲榜提交
|
2022-10-31 18:13:41 +08:00 |
lihaiyang
|
a688cd5ffe
|
魂印冲榜称号
|
2022-10-31 16:51:37 +08:00 |
lihaiyang
|
dcb2321134
|
【称号】=============开服冲榜称号上传
|
2022-10-21 17:04:15 +08:00 |
wangzhenxing
|
9faaa0cd5d
|
[gm]======冲榜图片提交
|
2022-10-28 19:06:31 +08:00 |
wangzhenxing
|
ac078416dd
|
[gm]======转盘提交
|
2022-10-27 15:32:13 +08:00 |
wangzhenxing
|
5fbc31d8e8
|
[gm]======免费充值界面修改
|
2022-10-25 13:51:43 +08:00 |
lihaiyang
|
fa6df99528
|
【名望】===背景添加九宫格
|
2022-10-24 15:29:37 +08:00 |
lihaiyang
|
8ac9c82ca2
|
【名望】===等级图标
|
2022-10-24 11:32:14 +08:00 |
lihaiyang
|
39dd11c6e8
|
【名望】====修正标题
|
2022-10-24 11:26:40 +08:00 |
lihaiyang
|
3d9fb70f74
|
【名望】============添加名望底框
|
2022-10-24 11:05:29 +08:00 |
wangzhenxing
|
8d63d391a6
|
[gm]==============声望特权提交
|
2022-10-20 17:48:00 +08:00 |
wangzhenxing
|
b0532edcca
|
[gm]======图片资源提交
|
2022-10-14 17:28:39 +08:00 |
wangzhenxing
|
efe732d91d
|
[gm]=============刷冲特权提交
|
2022-09-23 15:24:10 +08:00 |
lihaiyang
|
dbe58e993e
|
[gm]=======称号提交
|
2022-09-22 11:45:28 +08:00 |
wangzhenxing
|
a8f46604c9
|
[gm]======创角即送提交
|
2022-09-21 16:08:59 +08:00 |
wangzhenxing
|
fdaec2ac28
|
[gm修改器]=====提交
|
2022-09-20 17:04:48 +08:00 |
lihaiyang
|
f50028cef7
|
[无限资源阁]========界面修改提交
|
2022-09-01 18:22:04 +08:00 |
wangzhenxing
|
ff824e3f3a
|
[全民福利]=====预设修改提交
|
2022-09-14 13:33:22 +08:00 |
yuanshuai
|
7447eab324
|
神尊特权预设修改
|
2022-09-13 16:50:56 +08:00 |
yuanshuai
|
23416c35cf
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-09-09 18:09:59 +08:00 |
yuanshuai
|
d42106b07e
|
神尊特权提交
|
2022-09-09 18:09:45 +08:00 |