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 |
wangzhenxing
|
3f8a00cb14
|
[神兵]==================修改提交
|
2023-04-11 14:41:36 +08:00 |
wangzhenxing
|
826f58ce6e
|
神兵提交
|
2023-03-28 13:57:59 +08:00 |
wangzhenxing
|
04a84da290
|
多队塔红点提交
|
2023-03-22 14:58:19 +08:00 |
wangzhenxing
|
4848d707ff
|
多队塔修改提交
|
2023-03-21 16:12:57 +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
|
4a411833a5
|
多队塔提交
|
2023-03-20 11:22:44 +08:00 |
wangzhenxing
|
5aeffabd6f
|
助战法相信息显示修改
|
2023-03-10 13:29:22 +08:00 |
wangzhenxing
|
46ddd9696a
|
itemview 去除法相点击事件
|
2023-02-21 11:48:11 +08:00 |
wangzhenxing
|
726b53355e
|
法相背包修改提交
|
2023-02-19 21:21:45 +08:00 |
wangzhenxing
|
0b6d8ab978
|
法相提交
|
2023-02-17 19:43:00 +08:00 |
wangzhenxing
|
6a44a24e2b
|
野球拳法跳转修改
|
2023-02-10 17:03:29 +08:00 |
wangzhenxing
|
4a4682981a
|
装备摘星阁处理
|
2023-01-24 19:57:57 +08:00 |
wangzhenxing
|
325da0493a
|
妖晶显示修改
|
2023-01-17 11:37:40 +08:00 |